From 89eeb1655ab3a342fe9b19986e4aa5e58cf39575 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 28 二月 2022 19:15:19 +0800
Subject: [PATCH] 完成物业公司添加功能
---
service-store/src/main/java/com/java110/store/api/ContractApi.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/api/ContractApi.java b/service-store/src/main/java/com/java110/store/api/ContractApi.java
index 22eda6e..b1e1788 100755
--- a/service-store/src/main/java/com/java110/store/api/ContractApi.java
+++ b/service-store/src/main/java/com/java110/store/api/ContractApi.java
@@ -20,9 +20,9 @@
import com.java110.po.contractChangePlan.ContractChangePlanPo;
import com.java110.po.contractChangePlanDetail.ContractChangePlanDetailPo;
import com.java110.po.contractChangePlanDetailAttr.ContractChangePlanDetailAttrPo;
+import com.java110.po.contractChangePlanRoom.ContractChangePlanRoomPo;
import com.java110.po.contractCollectionPlan.ContractCollectionPlanPo;
import com.java110.po.contractFile.ContractFilePo;
-import com.java110.po.contractPartya.ContractPartyaPo;
import com.java110.po.contractRoom.ContractRoomPo;
import com.java110.po.contractType.ContractTypePo;
import com.java110.po.contractTypeSpec.ContractTypeSpecPo;
@@ -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});
@@ -849,9 +851,27 @@
contractChangePlanPo.setState(ContractChangePlanDto.STATE_W);
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));
+ roomInfo = rooms.getJSONObject(roomIndex);
+ contractChangePlanRoomPo = BeanConvertUtil.covertBean(roomInfo, ContractChangePlanRoomPo.class);
+ contractChangePlanRoomPo.setRoomName(roomInfo.getString("floorNum")
+ +"-"+roomInfo.getString("unitNum")
+ +"-"+roomInfo.getString("roomNum"));
+ contractChangePlanRoomPos.add(contractChangePlanRoomPo);
+ }
+ }
+ }
+
ContractChangePlanDetailPo contractChangePlanDetailPo = BeanConvertUtil.covertBean(reqJson, ContractChangePlanDetailPo.class);
contractChangePlanDetailPo.setStoreId(storeId);
- return saveContractChangePlanBMOImpl.save(contractChangePlanPo, contractChangePlanDetailPo);
+ return saveContractChangePlanBMOImpl.save(contractChangePlanPo, contractChangePlanDetailPo,contractChangePlanRoomPos);
}
/**
@@ -938,6 +958,7 @@
ContractChangePlanDto contractChangePlanDto = new ContractChangePlanDto();
contractChangePlanDto.setTaskId(reqJson.getString("taskId"));
contractChangePlanDto.setPlanId(reqJson.getString("planId"));
+ contractChangePlanDto.setContractId(reqJson.getString("contractId"));
contractChangePlanDto.setStoreId(storeId);
contractChangePlanDto.setAuditCode(reqJson.getString("state"));
contractChangePlanDto.setAuditMessage(reqJson.getString("remark"));
@@ -1326,7 +1347,7 @@
*/
@RequestMapping(value = "/queryContractRoom", method = RequestMethod.GET)
public ResponseEntity<String> queryContractRoom(@RequestHeader(value = "store-id") String storeId,
- @RequestParam(value = "contractId",required = false) String contractId,
+ @RequestParam(value = "contractId", required = false) String contractId,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
ContractRoomDto contractRoomDto = new ContractRoomDto();
--
Gitblit v1.8.0