From 0db231806e34e8580c450276ea3e194e9f78ac13 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 07 四月 2021 22:52:21 +0800
Subject: [PATCH] 优化代码
---
service-store/src/main/java/com/java110/store/api/ContractApi.java | 179 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 169 insertions(+), 10 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 8715448..7a7a143 100644
--- a/service-store/src/main/java/com/java110/store/api/ContractApi.java
+++ b/service-store/src/main/java/com/java110/store/api/ContractApi.java
@@ -6,6 +6,7 @@
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.contractType.ContractTypeDto;
import com.java110.dto.contractTypeSpec.ContractTypeSpecDto;
import com.java110.dto.contractTypeTemplate.ContractTypeTemplateDto;
@@ -15,6 +16,7 @@
import com.java110.po.contractChangePlan.ContractChangePlanPo;
import com.java110.po.contractChangePlanDetail.ContractChangePlanDetailPo;
import com.java110.po.contractChangePlanDetailAttr.ContractChangePlanDetailAttrPo;
+import com.java110.po.contractCollectionPlan.ContractCollectionPlanPo;
import com.java110.po.contractType.ContractTypePo;
import com.java110.po.contractTypeSpec.ContractTypeSpecPo;
import com.java110.po.contractTypeTemplate.ContractTypeTemplatePo;
@@ -38,6 +40,10 @@
import com.java110.store.bmo.contractChangePlanDetailAttr.IGetContractChangePlanDetailAttrBMO;
import com.java110.store.bmo.contractChangePlanDetailAttr.ISaveContractChangePlanDetailAttrBMO;
import com.java110.store.bmo.contractChangePlanDetailAttr.IUpdateContractChangePlanDetailAttrBMO;
+import com.java110.store.bmo.contractCollectionPlan.IDeleteContractCollectionPlanBMO;
+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.contractType.IDeleteContractTypeBMO;
import com.java110.store.bmo.contractType.IGetContractTypeBMO;
import com.java110.store.bmo.contractType.ISaveContractTypeBMO;
@@ -144,6 +150,17 @@
@Autowired
private IPrintContractTemplateBMO printContractTemplateBMO;
+
+ @Autowired
+ private ISaveContractCollectionPlanBMO saveContractCollectionPlanBMOImpl;
+ @Autowired
+ private IUpdateContractCollectionPlanBMO updateContractCollectionPlanBMOImpl;
+ @Autowired
+ private IDeleteContractCollectionPlanBMO deleteContractCollectionPlanBMOImpl;
+
+ @Autowired
+ private IGetContractCollectionPlanBMO getContractCollectionPlanBMOImpl;
+
/**
* 寰俊淇濆瓨娑堟伅妯℃澘
*
@@ -174,6 +191,7 @@
ContractPo contractPo = BeanConvertUtil.covertBean(reqJson, ContractPo.class);
contractPo.setStoreId(storeId);
+ contractPo.setStartUserId(userId);
if (!reqJson.containsKey("contractParentId") || "-1".equals(reqJson.getString("contractParentId"))) {
contractPo.setContractParentId("-1");
}
@@ -232,6 +250,31 @@
return updateContractBMOImpl.update(contractPo, reqJson);
}
+
+ /**
+ * 寰俊淇敼娑堟伅妯℃澘
+ *
+ * @param reqJson
+ * @return
+ * @serviceCode /contract/needAuditContract
+ * @path /app/contract/needAuditContract
+ */
+ @RequestMapping(value = "/needAuditContract", method = RequestMethod.POST)
+ public ResponseEntity<String> needAuditContract(
+ @RequestHeader(value = "store-id") String storeId,
+ @RequestHeader(value = "user-id") String userId,
+ @RequestBody JSONObject reqJson) {
+ ContractDto contractDto = new ContractDto();
+ contractDto.setTaskId(reqJson.getString("taskId"));
+ contractDto.setContractId(reqJson.getString("contractId"));
+ contractDto.setStoreId(storeId);
+ contractDto.setAuditCode(reqJson.getString("state"));
+ contractDto.setAuditMessage(reqJson.getString("remark"));
+ contractDto.setCurrentUserId(userId);
+
+ return updateContractBMOImpl.needAuditContract(contractDto, reqJson);
+ }
+
/**
* 寰俊淇敼娑堟伅妯℃澘
*
@@ -285,7 +328,9 @@
public ResponseEntity<String> queryContract(@RequestHeader(value = "store-id") String storeId,
@RequestParam(value = "state", required = false) String state,
@RequestParam(value = "expiration", required = false) String expiration,
- @RequestParam(value = "objId",required = false) String objId,
+ @RequestParam(value = "objId", required = false) String objId,
+ @RequestParam(value = "contractId", required = false) String contractId,
+ @RequestParam(value = "contractCode", required = false) String contractCode,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
ContractDto contractDto = new ContractDto();
@@ -294,6 +339,8 @@
contractDto.setStoreId(storeId);
contractDto.setState(state);
contractDto.setObjId(objId);
+ contractDto.setContractId(contractId);
+ contractDto.setContractCode(contractCode);
//濡傛灉鏄埌鏈熷悎鍚�
if ("1".equals(expiration)) {
contractDto.setNoStates(new String[]{ContractDto.STATE_COMPLAINT, ContractDto.STATE_FAIL});
@@ -358,9 +405,9 @@
*/
@RequestMapping(value = "/queryContractChangeTask", method = RequestMethod.GET)
public ResponseEntity<String> queryContractChangeTask(@RequestHeader(value = "store-id") String storeId,
- @RequestHeader(value = "user-id") String userId,
- @RequestParam(value = "page") int page,
- @RequestParam(value = "row") int row) {
+ @RequestHeader(value = "user-id") String userId,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
AuditUser auditUser = new AuditUser();
auditUser.setUserId(userId);
auditUser.setPage(page);
@@ -380,9 +427,9 @@
*/
@RequestMapping(value = "/queryContractChangeHistoryTask", method = RequestMethod.GET)
public ResponseEntity<String> queryContractChangeHistoryTask(@RequestHeader(value = "store-id") String storeId,
- @RequestHeader(value = "user-id") String userId,
- @RequestParam(value = "page") int page,
- @RequestParam(value = "row") int row) {
+ @RequestHeader(value = "user-id") String userId,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
AuditUser auditUser = new AuditUser();
@@ -789,13 +836,13 @@
* @path /app/contract/deleteContractChangePlan
*/
@RequestMapping(value = "/deleteContractChangePlan", method = RequestMethod.POST)
- public ResponseEntity<String> deleteContractChangePlan(@RequestBody JSONObject reqJson) {
- Assert.hasKeyAndValue(reqJson, "communityId", "灏忓尯ID涓嶈兘涓虹┖");
+ public ResponseEntity<String> deleteContractChangePlan(@RequestHeader(value = "store-id") String storeId,
+ @RequestBody JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "planId", "planId涓嶈兘涓虹┖");
-
ContractChangePlanPo contractChangePlanPo = BeanConvertUtil.covertBean(reqJson, ContractChangePlanPo.class);
+ contractChangePlanPo.setStoreId(storeId);
return deleteContractChangePlanBMOImpl.delete(contractChangePlanPo);
}
@@ -825,6 +872,30 @@
return getContractChangePlanBMOImpl.get(contractChangePlanDto);
}
+
+ /**
+ * 鍚堝悓鍙樻洿瀹℃牳
+ *
+ * @param reqJson
+ * @return
+ * @serviceCode /contract/needAuditContractPlan
+ * @path /app/contract/needAuditContractPlan
+ */
+ @RequestMapping(value = "/needAuditContractPlan", method = RequestMethod.POST)
+ public ResponseEntity<String> needAuditContractPlan(
+ @RequestHeader(value = "store-id") String storeId,
+ @RequestHeader(value = "user-id") String userId,
+ @RequestBody JSONObject reqJson) {
+ ContractChangePlanDto contractChangePlanDto = new ContractChangePlanDto();
+ contractChangePlanDto.setTaskId(reqJson.getString("taskId"));
+ contractChangePlanDto.setPlanId(reqJson.getString("planId"));
+ contractChangePlanDto.setStoreId(storeId);
+ contractChangePlanDto.setAuditCode(reqJson.getString("state"));
+ contractChangePlanDto.setAuditMessage(reqJson.getString("remark"));
+ contractChangePlanDto.setCurrentUserId(userId);
+
+ return updateContractBMOImpl.needAuditContractPlan(contractChangePlanDto, reqJson);
+ }
/**
* 寰俊淇濆瓨娑堟伅妯℃澘
@@ -1050,4 +1121,92 @@
}
+ /**
+ * 寰俊淇濆瓨娑堟伅妯℃澘
+ *
+ * @param reqJson
+ * @return
+ * @serviceCode /contract/saveContractCollectionPlan
+ * @path /app/contract/saveContractCollectionPlan
+ */
+ @RequestMapping(value = "/saveContractCollectionPlan", method = RequestMethod.POST)
+ public ResponseEntity<String> saveContractCollectionPlan(@RequestHeader(value = "store-id") String storeId,
+ @RequestBody JSONObject reqJson) {
+
+ Assert.hasKeyAndValue(reqJson, "contractId", "璇锋眰鎶ユ枃涓湭鍖呭惈contractId");
+ Assert.hasKeyAndValue(reqJson, "feeId", "璇锋眰鎶ユ枃涓湭鍖呭惈feeId");
+ Assert.hasKeyAndValue(reqJson, "storeId", "璇锋眰鎶ユ枃涓湭鍖呭惈storeId");
+ Assert.hasKeyAndValue(reqJson, "planName", "璇锋眰鎶ユ枃涓湭鍖呭惈planName");
+
+
+ ContractCollectionPlanPo contractCollectionPlanPo = BeanConvertUtil.covertBean(reqJson, ContractCollectionPlanPo.class);
+ contractCollectionPlanPo.setStoreId(storeId);
+ return saveContractCollectionPlanBMOImpl.save(contractCollectionPlanPo);
+ }
+
+ /**
+ * 寰俊淇敼娑堟伅妯℃澘
+ *
+ * @param reqJson
+ * @return
+ * @serviceCode /contract/updateContractCollectionPlan
+ * @path /app/contract/updateContractCollectionPlan
+ */
+ @RequestMapping(value = "/updateContractCollectionPlan", method = RequestMethod.POST)
+ public ResponseEntity<String> updateContractCollectionPlan(@RequestHeader(value = "store-id") String storeId,
+ @RequestBody JSONObject reqJson) {
+
+ Assert.hasKeyAndValue(reqJson, "contractId", "璇锋眰鎶ユ枃涓湭鍖呭惈contractId");
+ Assert.hasKeyAndValue(reqJson, "feeId", "璇锋眰鎶ユ枃涓湭鍖呭惈feeId");
+ Assert.hasKeyAndValue(reqJson, "storeId", "璇锋眰鎶ユ枃涓湭鍖呭惈storeId");
+ Assert.hasKeyAndValue(reqJson, "planName", "璇锋眰鎶ユ枃涓湭鍖呭惈planName");
+ Assert.hasKeyAndValue(reqJson, "planId", "planId涓嶈兘涓虹┖");
+
+
+ ContractCollectionPlanPo contractCollectionPlanPo = BeanConvertUtil.covertBean(reqJson, ContractCollectionPlanPo.class);
+ contractCollectionPlanPo.setStoreId(storeId);
+ return updateContractCollectionPlanBMOImpl.update(contractCollectionPlanPo);
+ }
+
+ /**
+ * 寰俊鍒犻櫎娑堟伅妯℃澘
+ *
+ * @param reqJson
+ * @return
+ * @serviceCode /contract/deleteContractCollectionPlan
+ * @path /app/contract/deleteContractCollectionPlan
+ */
+ @RequestMapping(value = "/deleteContractCollectionPlan", method = RequestMethod.POST)
+ public ResponseEntity<String> deleteContractCollectionPlan(@RequestHeader(value = "store-id") String storeId,
+ @RequestBody JSONObject reqJson) {
+
+ Assert.hasKeyAndValue(reqJson, "planId", "planId涓嶈兘涓虹┖");
+
+
+ ContractCollectionPlanPo contractCollectionPlanPo = BeanConvertUtil.covertBean(reqJson, ContractCollectionPlanPo.class);
+ contractCollectionPlanPo.setStoreId(storeId);
+ return deleteContractCollectionPlanBMOImpl.delete(contractCollectionPlanPo);
+ }
+
+ /**
+ * 寰俊鍒犻櫎娑堟伅妯℃澘
+ *
+ * @param storeId 鍟嗘埛ID
+ * @return
+ * @serviceCode /contract/queryContractCollectionPlan
+ * @path /app/contract/queryContractCollectionPlan
+ */
+ @RequestMapping(value = "/queryContractCollectionPlan", method = RequestMethod.GET)
+ public ResponseEntity<String> queryContractCollectionPlan(@RequestHeader(value = "store-id") String storeId,
+ @RequestParam(value = "communityId") String communityId,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
+ ContractCollectionPlanDto contractCollectionPlanDto = new ContractCollectionPlanDto();
+ contractCollectionPlanDto.setPage(page);
+ contractCollectionPlanDto.setRow(row);
+ contractCollectionPlanDto.setStoreId(storeId);
+ return getContractCollectionPlanBMOImpl.get(contractCollectionPlanDto);
+ }
+
+
}
--
Gitblit v1.8.0