Lianxun_Java.git

			@@ -379,6 +379,7 @@
			@RequestParam(value = "expiration", required = false) String expiration,
			@RequestParam(value = "objId", required = false) String objId,
			@RequestParam(value = "contractId", required = false) String contractId,
			@RequestParam(value = "contractNameLike", required = false) String contractNameLike,
			@RequestParam(value = "contractCode", required = false) String contractCode,
			@RequestParam(value = "page") int page,
			@RequestParam(value = "row") int row) {
			@@ -390,6 +391,7 @@
			contractDto.setObjId(objId);
			contractDto.setContractId(contractId);
			contractDto.setContractCode(contractCode);
			contractDto.setContractNameLike(contractNameLike);
			//如果是到期合同
			if ("1".equals(expiration)) {
			contractDto.setNoStates(new String[]{ContractDto.STATE_COMPLAINT, ContractDto.STATE_FAIL});
			@@ -850,11 +852,19 @@
			contractChangePlanPo.setRemark(reqJson.getString("changeRemark"));

			List<ContractChangePlanRoomPo> contractChangePlanRoomPos = new ArrayList<>();
			ContractChangePlanRoomPo contractChangePlanRoomPo = null;
			JSONObject roomInfo = null;
			if (reqJson.containsKey("rooms")) {
			JSONArray rooms = reqJson.getJSONArray("rooms");
			if (rooms != null && rooms.size() > 0) {
			for (int roomIndex = 0; roomIndex < rooms.size(); roomIndex++) {
			contractChangePlanRoomPos.add(BeanConvertUtil.covertBean(rooms.getJSONObject(roomIndex), ContractChangePlanRoomPo.class));
			// contractChangePlanRoomPos.add(BeanConvertUtil.covertBean(rooms.getJSONObject(roomIndex), ContractChangePlanRoomPo.class));
			roomInfo = rooms.getJSONObject(roomIndex);
			contractChangePlanRoomPo = BeanConvertUtil.covertBean(roomInfo, ContractChangePlanRoomPo.class);
			contractChangePlanRoomPo.setRoomName(roomInfo.getString("floorNum")
			+"-"+roomInfo.getString("unitNum")
			+"-"+roomInfo.getString("roomNum"));
			contractChangePlanRoomPos.add(contractChangePlanRoomPo);
			}
			}
			}