From dece32aeb6b9053e345fda5991a1671463e35e4d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 31 八月 2021 00:33:32 +0800
Subject: [PATCH] 优化代码
---
service-store/src/main/java/com/java110/store/api/ContractApi.java | 148 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 128 insertions(+), 20 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
old mode 100644
new mode 100755
index 2346da0..ae84700
--- a/service-store/src/main/java/com/java110/store/api/ContractApi.java
+++ b/service-store/src/main/java/com/java110/store/api/ContractApi.java
@@ -4,15 +4,13 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.factory.GenerateCodeFactory;
-
-import com.alibaba.fastjson.JSONObject;
-
import com.java110.dto.contract.ContractDto;
import com.java110.dto.contractAttr.ContractAttrDto;
import com.java110.dto.contractChangePlan.ContractChangePlanDto;
import com.java110.dto.contractChangePlanDetail.ContractChangePlanDetailDto;
import com.java110.dto.contractChangePlanDetailAttr.ContractChangePlanDetailAttrDto;
import com.java110.dto.contractCollectionPlan.ContractCollectionPlanDto;
+import com.java110.dto.contractRoom.ContractRoomDto;
import com.java110.dto.contractType.ContractTypeDto;
import com.java110.dto.contractTypeSpec.ContractTypeSpecDto;
import com.java110.dto.contractTypeTemplate.ContractTypeTemplateDto;
@@ -22,18 +20,13 @@
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.contractRoom.ContractRoomPo;
import com.java110.po.contractType.ContractTypePo;
import com.java110.po.contractTypeSpec.ContractTypeSpecPo;
import com.java110.po.contractTypeTemplate.ContractTypeTemplatePo;
-import com.java110.po.purchase.PurchaseApplyDetailPo;
-
-import com.java110.po.contractType.ContractTypePo;
-import com.java110.po.contractTypeSpec.ContractTypeSpecPo;
-import com.java110.po.contractTypeTemplate.ContractTypeTemplatePo;
-
import com.java110.store.bmo.contract.IDeleteContractBMO;
import com.java110.store.bmo.contract.IGetContractBMO;
import com.java110.store.bmo.contract.ISaveContractBMO;
@@ -58,6 +51,10 @@
import com.java110.store.bmo.contractCollectionPlan.IGetContractCollectionPlanBMO;
import com.java110.store.bmo.contractCollectionPlan.ISaveContractCollectionPlanBMO;
import com.java110.store.bmo.contractCollectionPlan.IUpdateContractCollectionPlanBMO;
+import com.java110.store.bmo.contractRoom.IDeleteContractRoomBMO;
+import com.java110.store.bmo.contractRoom.IGetContractRoomBMO;
+import com.java110.store.bmo.contractRoom.ISaveContractRoomBMO;
+import com.java110.store.bmo.contractRoom.IUpdateContractRoomBMO;
import com.java110.store.bmo.contractType.IDeleteContractTypeBMO;
import com.java110.store.bmo.contractType.IGetContractTypeBMO;
import com.java110.store.bmo.contractType.ISaveContractTypeBMO;
@@ -76,7 +73,6 @@
import java.util.ArrayList;
import java.util.List;
-
@RestController
@@ -179,6 +175,16 @@
@Autowired
private IGetContractCollectionPlanBMO getContractCollectionPlanBMOImpl;
+ @Autowired
+ private ISaveContractRoomBMO saveContractRoomBMOImpl;
+ @Autowired
+ private IUpdateContractRoomBMO updateContractRoomBMOImpl;
+ @Autowired
+ private IDeleteContractRoomBMO deleteContractRoomBMOImpl;
+
+ @Autowired
+ private IGetContractRoomBMO getContractRoomBMOImpl;
+
/**
* 寰俊淇濆瓨娑堟伅妯℃澘
*
@@ -216,15 +222,18 @@
reqJson.put("userId", userId);
- JSONArray contractFiles = reqJson.getJSONArray("contractFilePo");
- List<ContractFilePo> contractFilePos = new ArrayList<>();
- for (int conFileIndex = 0; conFileIndex < contractFiles.size(); conFileIndex++) {
- JSONObject resourceStore = contractFiles.getJSONObject(conFileIndex);
- ContractFilePo contractFilePo = BeanConvertUtil.covertBean(resourceStore, ContractFilePo.class);
- contractFilePo.setContractFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_contractFileId));
- contractFilePos.add(contractFilePo);
+ if (reqJson.containsKey("contractFilePo")) {
+ JSONArray contractFiles = reqJson.getJSONArray("contractFilePo");
+ List<ContractFilePo> contractFilePos = new ArrayList<>();
+ for (int conFileIndex = 0; conFileIndex < contractFiles.size(); conFileIndex++) {
+ JSONObject resourceStore = contractFiles.getJSONObject(conFileIndex);
+ ContractFilePo contractFilePo = BeanConvertUtil.covertBean(resourceStore, ContractFilePo.class);
+ contractFilePo.setContractFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_contractFileId));
+ contractFilePos.add(contractFilePo);
+ }
+ contractPo.setContractFilePo(contractFilePos);
}
- contractPo.setContractFilePo(contractFilePos);
+
return saveContractBMOImpl.save(contractPo, reqJson);
}
@@ -370,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) {
@@ -381,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});
@@ -840,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);
}
/**
@@ -1249,4 +1278,83 @@
}
+ /**
+ * 寰俊淇濆瓨娑堟伅妯℃澘
+ *
+ * @param reqJson
+ * @return
+ * @serviceCode /contract/saveContractRoom
+ * @path /app/contract/saveContractRoom
+ */
+ @RequestMapping(value = "/saveContractRoom", method = RequestMethod.POST)
+ public ResponseEntity<String> saveContractRoom(@RequestBody JSONObject reqJson) {
+
+ Assert.hasKeyAndValue(reqJson, "contractId", "璇锋眰鎶ユ枃涓湭鍖呭惈contractId");
+ Assert.hasKeyAndValue(reqJson, "roomId", "璇锋眰鎶ユ枃涓湭鍖呭惈roomId");
+
+
+ ContractRoomPo contractRoomPo = BeanConvertUtil.covertBean(reqJson, ContractRoomPo.class);
+ return saveContractRoomBMOImpl.save(contractRoomPo);
+ }
+
+ /**
+ * 寰俊淇敼娑堟伅妯℃澘
+ *
+ * @param reqJson
+ * @return
+ * @serviceCode /contract/updateContractRoom
+ * @path /app/contract/updateContractRoom
+ */
+ @RequestMapping(value = "/updateContractRoom", method = RequestMethod.POST)
+ public ResponseEntity<String> updateContractRoom(@RequestBody JSONObject reqJson) {
+
+ Assert.hasKeyAndValue(reqJson, "contractId", "璇锋眰鎶ユ枃涓湭鍖呭惈contractId");
+ Assert.hasKeyAndValue(reqJson, "roomId", "璇锋眰鎶ユ枃涓湭鍖呭惈roomId");
+ Assert.hasKeyAndValue(reqJson, "crId", "crId涓嶈兘涓虹┖");
+
+
+ ContractRoomPo contractRoomPo = BeanConvertUtil.covertBean(reqJson, ContractRoomPo.class);
+ return updateContractRoomBMOImpl.update(contractRoomPo);
+ }
+
+ /**
+ * 寰俊鍒犻櫎娑堟伅妯℃澘
+ *
+ * @param reqJson
+ * @return
+ * @serviceCode /contract/deleteContractRoom
+ * @path /app/contract/deleteContractRoom
+ */
+ @RequestMapping(value = "/deleteContractRoom", method = RequestMethod.POST)
+ public ResponseEntity<String> deleteContractRoom(@RequestBody JSONObject reqJson) {
+ Assert.hasKeyAndValue(reqJson, "communityId", "灏忓尯ID涓嶈兘涓虹┖");
+
+ Assert.hasKeyAndValue(reqJson, "crId", "crId涓嶈兘涓虹┖");
+
+
+ ContractRoomPo contractRoomPo = BeanConvertUtil.covertBean(reqJson, ContractRoomPo.class);
+ return deleteContractRoomBMOImpl.delete(contractRoomPo);
+ }
+
+ /**
+ * 寰俊鍒犻櫎娑堟伅妯℃澘
+ *
+ * @param storeId 灏忓尯ID
+ * @return
+ * @serviceCode /contract/queryContractRoom
+ * @path /app/contract/queryContractRoom
+ */
+ @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 = "page") int page,
+ @RequestParam(value = "row") int row) {
+ ContractRoomDto contractRoomDto = new ContractRoomDto();
+ contractRoomDto.setPage(page);
+ contractRoomDto.setRow(row);
+ contractRoomDto.setStoreId(storeId);
+ contractRoomDto.setContractId(contractId);
+ return getContractRoomBMOImpl.get(contractRoomDto);
+ }
+
}
--
Gitblit v1.8.0