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 | 312 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 298 insertions(+), 14 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 9855642..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,14 +6,17 @@
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;
+import com.java110.entity.audit.AuditUser;
import com.java110.po.contract.ContractPo;
import com.java110.po.contractAttr.ContractAttrPo;
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;
@@ -37,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;
@@ -45,21 +52,13 @@
import com.java110.store.bmo.contractTypeSpec.IGetContractTypeSpecBMO;
import com.java110.store.bmo.contractTypeSpec.ISaveContractTypeSpecBMO;
import com.java110.store.bmo.contractTypeSpec.IUpdateContractTypeSpecBMO;
-import com.java110.store.bmo.contractTypeTemplate.IDeleteContractTypeTemplateBMO;
-import com.java110.store.bmo.contractTypeTemplate.IGetContractTypeTemplateBMO;
-import com.java110.store.bmo.contractTypeTemplate.ISaveContractTypeTemplateBMO;
-import com.java110.store.bmo.contractTypeTemplate.IUpdateContractTypeTemplateBMO;
+import com.java110.store.bmo.contractTypeTemplate.*;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
@RestController
@@ -148,6 +147,20 @@
@Autowired
private IGetContractChangePlanDetailAttrBMO getContractChangePlanDetailAttrBMOImpl;
+ @Autowired
+ private IPrintContractTemplateBMO printContractTemplateBMO;
+
+
+ @Autowired
+ private ISaveContractCollectionPlanBMO saveContractCollectionPlanBMOImpl;
+ @Autowired
+ private IUpdateContractCollectionPlanBMO updateContractCollectionPlanBMOImpl;
+ @Autowired
+ private IDeleteContractCollectionPlanBMO deleteContractCollectionPlanBMOImpl;
+
+ @Autowired
+ private IGetContractCollectionPlanBMO getContractCollectionPlanBMOImpl;
+
/**
* 寰俊淇濆瓨娑堟伅妯℃澘
*
@@ -178,10 +191,11 @@
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");
}
- reqJson.put("userId",userId);
+ reqJson.put("userId", userId);
return saveContractBMOImpl.save(contractPo, reqJson);
}
@@ -234,6 +248,31 @@
ContractPo contractPo = BeanConvertUtil.covertBean(reqJson, ContractPo.class);
contractPo.setState(ContractDto.STATE_COMPLAINT);
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);
}
/**
@@ -289,6 +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 = "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();
@@ -296,12 +338,106 @@
contractDto.setRow(row);
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});
contractDto.setEndTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
}
return getContractBMOImpl.get(contractDto);
+ }
+
+ /**
+ * 鍚堝悓璧疯崏寰呭姙
+ *
+ * @param storeId 鍟嗘埛ID
+ * @return
+ * @serviceCode /contract/queryContractTask
+ * @path /app/contract/queryContractTask
+ */
+ @RequestMapping(value = "/queryContractTask", method = RequestMethod.GET)
+ public ResponseEntity<String> queryContractTask(@RequestHeader(value = "store-id") String storeId,
+ @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);
+ auditUser.setRow(row);
+ auditUser.setStoreId(storeId);
+
+ return getContractBMOImpl.queryContractTask(auditUser);
+ }
+
+ /**
+ * 鍚堝悓璧疯崏宸插姙
+ *
+ * @param storeId 鍟嗘埛ID
+ * @return
+ * @serviceCode /contract/queryContractHistoryTask
+ * @path /app/contract/queryContractHistoryTask
+ */
+ @RequestMapping(value = "/queryContractHistoryTask", method = RequestMethod.GET)
+ public ResponseEntity<String> queryContractHistoryTask(@RequestHeader(value = "store-id") String storeId,
+ @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);
+ auditUser.setRow(row);
+ auditUser.setStoreId(storeId);
+
+ return getContractBMOImpl.queryContractHistoryTask(auditUser);
+ }
+
+ /**
+ * 鍚堝悓鍙樻洿寰呭姙
+ *
+ * @param storeId 鍟嗘埛ID
+ * @return
+ * @serviceCode /contract/queryContractChangeTask
+ * @path /app/contract/queryContractChangeTask
+ */
+ @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) {
+ AuditUser auditUser = new AuditUser();
+ auditUser.setUserId(userId);
+ auditUser.setPage(page);
+ auditUser.setRow(row);
+ auditUser.setStoreId(storeId);
+
+ return getContractBMOImpl.queryContractChangeTask(auditUser);
+ }
+
+ /**
+ * 鍚堝悓鍙樻洿宸插姙
+ *
+ * @param storeId 鍟嗘埛ID
+ * @return
+ * @serviceCode /contract/queryContractChangeHistoryTask
+ * @path /app/contract/queryContractChangeHistoryTask
+ */
+ @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) {
+
+
+ AuditUser auditUser = new AuditUser();
+ auditUser.setUserId(userId);
+ auditUser.setPage(page);
+ auditUser.setRow(row);
+ auditUser.setStoreId(storeId);
+ return getContractBMOImpl.queryContractChangeHistoryTask(auditUser);
}
/**
@@ -700,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);
}
@@ -736,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);
+ }
/**
* 寰俊淇濆瓨娑堟伅妯℃澘
@@ -925,4 +1085,128 @@
return getContractChangePlanDetailAttrBMOImpl.get(contractChangePlanDetailAttrDto);
}
+ /**
+ * 鍚堝悓鎵撳嵃
+ *
+ * @param storeId 鍟嗘埛ID
+ * @return
+ * @serviceCode /contract/printContractTemplate
+ * @path /app/contract/printContractTemplate
+ */
+ @RequestMapping(value = "/printContractTemplate", method = RequestMethod.GET)
+ public ResponseEntity<String> printContractTemplate(@RequestHeader(value = "store-id") String storeId,
+ @RequestParam(value = "contractTypeId", required = false) String contractTypeId,
+ @RequestParam(value = "contractId", required = false) String contractId,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
+ ContractTypeTemplateDto contractTypeTemplateDto = new ContractTypeTemplateDto();
+ contractTypeTemplateDto.setPage(page);
+ contractTypeTemplateDto.setRow(row);
+ contractTypeTemplateDto.setStoreId(storeId);
+ contractTypeTemplateDto.setContractTypeId(contractTypeId);
+
+ ContractDto contractDto = new ContractDto();
+ contractDto.setPage(page);
+ contractDto.setRow(row);
+ contractDto.setStoreId(storeId);
+ contractDto.setContractId(contractId);
+
+ ContractTypeSpecDto contractTypeSpecDto = new ContractTypeSpecDto();
+ contractTypeSpecDto.setPage(page);
+ contractTypeSpecDto.setRow(100);
+ contractTypeSpecDto.setStoreId(storeId);
+ contractTypeSpecDto.setContractTypeId(contractTypeId);
+
+ return printContractTemplateBMO.get(contractTypeTemplateDto, contractDto, contractTypeSpecDto);
+ }
+
+
+ /**
+ * 寰俊淇濆瓨娑堟伅妯℃澘
+ *
+ * @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