From dd6687b118561100e1677e88a9c2f5842a54c531 Mon Sep 17 00:00:00 2001
From: jialh <1972868360@qq.com>
Date: 星期四, 16 四月 2026 18:14:14 +0800
Subject: [PATCH] 水电话费
---
service-store/src/main/java/com/java110/store/api/ContractApi.java | 521 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 434 insertions(+), 87 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 3e0c94c..e62bbdd
--- a/service-store/src/main/java/com/java110/store/api/ContractApi.java
+++ b/service-store/src/main/java/com/java110/store/api/ContractApi.java
@@ -1,23 +1,32 @@
package com.java110.store.api;
+
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.java110.core.factory.GenerateCodeFactory;
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.contractType.ContractTypeDto;
-import com.java110.dto.contractTypeSpec.ContractTypeSpecDto;
-import com.java110.dto.contractTypeTemplate.ContractTypeTemplateDto;
-import com.java110.entity.audit.AuditUser;
+import com.java110.dto.contract.ContractAttrDto;
+import com.java110.dto.contract.ContractChangePlanDto;
+import com.java110.dto.contract.ContractChangePlanDetailDto;
+import com.java110.dto.contract.ContractChangePlanDetailAttrDto;
+import com.java110.dto.contract.ContractCollectionPlanDto;
+import com.java110.dto.contract.ContractRoomDto;
+import com.java110.dto.contract.ContractTypeDto;
+import com.java110.dto.contract.ContractTypeSpecDto;
+import com.java110.dto.contract.ContractTypeTemplateDto;
+import com.java110.dto.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.contractType.ContractTypePo;
-import com.java110.po.contractTypeSpec.ContractTypeSpecPo;
-import com.java110.po.contractTypeTemplate.ContractTypeTemplatePo;
+import com.java110.po.contract.ContractAttrPo;
+import com.java110.po.contract.ContractChangePlanPo;
+import com.java110.po.contract.ContractChangePlanDetailPo;
+import com.java110.po.contract.ContractChangePlanDetailAttrPo;
+import com.java110.po.contract.ContractChangePlanRoomPo;
+import com.java110.po.contract.ContractCollectionPlanPo;
+import com.java110.po.contract.ContractFilePo;
+import com.java110.po.contract.ContractRoomPo;
+import com.java110.po.contract.ContractTypePo;
+import com.java110.po.contract.ContractTypeSpecPo;
+import com.java110.po.contract.ContractTypeTemplatePo;
import com.java110.store.bmo.contract.IDeleteContractBMO;
import com.java110.store.bmo.contract.IGetContractBMO;
import com.java110.store.bmo.contract.ISaveContractBMO;
@@ -38,6 +47,14 @@
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.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;
@@ -49,10 +66,12 @@
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.*;
+
+import java.util.ArrayList;
+import java.util.List;
@RestController
@@ -143,6 +162,28 @@
@Autowired
private IPrintContractTemplateBMO printContractTemplateBMO;
+
+
+ @Autowired
+ private ISaveContractCollectionPlanBMO saveContractCollectionPlanBMOImpl;
+ @Autowired
+ private IUpdateContractCollectionPlanBMO updateContractCollectionPlanBMOImpl;
+ @Autowired
+ private IDeleteContractCollectionPlanBMO deleteContractCollectionPlanBMOImpl;
+
+ @Autowired
+ private IGetContractCollectionPlanBMO getContractCollectionPlanBMOImpl;
+
+ @Autowired
+ private ISaveContractRoomBMO saveContractRoomBMOImpl;
+ @Autowired
+ private IUpdateContractRoomBMO updateContractRoomBMOImpl;
+ @Autowired
+ private IDeleteContractRoomBMO deleteContractRoomBMOImpl;
+
+ @Autowired
+ private IGetContractRoomBMO getContractRoomBMOImpl;
+
/**
* 寰俊淇濆瓨娑堟伅妯℃澘
*
@@ -161,10 +202,10 @@
Assert.hasKeyAndValue(reqJson, "contractType", "璇锋眰鎶ユ枃涓湭鍖呭惈contractType");
Assert.hasKeyAndValue(reqJson, "partyA", "璇锋眰鎶ユ枃涓湭鍖呭惈partyA");
Assert.hasKeyAndValue(reqJson, "partyB", "璇锋眰鎶ユ枃涓湭鍖呭惈partyB");
- Assert.hasKeyAndValue(reqJson, "aContacts", "璇锋眰鎶ユ枃涓湭鍖呭惈aContacts");
- Assert.hasKeyAndValue(reqJson, "aLink", "璇锋眰鎶ユ枃涓湭鍖呭惈aLink");
- Assert.hasKeyAndValue(reqJson, "bContacts", "璇锋眰鎶ユ枃涓湭鍖呭惈bContacts");
- Assert.hasKeyAndValue(reqJson, "bLink", "璇锋眰鎶ユ枃涓湭鍖呭惈bLink");
+// Assert.hasKeyAndValue(reqJson, "aContacts", "璇锋眰鎶ユ枃涓湭鍖呭惈aContacts");
+// Assert.hasKeyAndValue(reqJson, "aLink", "璇锋眰鎶ユ枃涓湭鍖呭惈aLink");
+// Assert.hasKeyAndValue(reqJson, "bContacts", "璇锋眰鎶ユ枃涓湭鍖呭惈bContacts");
+// Assert.hasKeyAndValue(reqJson, "bLink", "璇锋眰鎶ユ枃涓湭鍖呭惈bLink");
Assert.hasKeyAndValue(reqJson, "operator", "璇锋眰鎶ユ枃涓湭鍖呭惈operator");
Assert.hasKeyAndValue(reqJson, "operatorLink", "璇锋眰鎶ユ枃涓湭鍖呭惈operatorLink");
Assert.hasKeyAndValue(reqJson, "startTime", "璇锋眰鎶ユ枃涓湭鍖呭惈startTime");
@@ -173,10 +214,27 @@
ContractPo contractPo = BeanConvertUtil.covertBean(reqJson, ContractPo.class);
contractPo.setStoreId(storeId);
+ contractPo.setStartUserId(userId);
+ contractPo.setCommunityId(reqJson.getString("communityId"));
if (!reqJson.containsKey("contractParentId") || "-1".equals(reqJson.getString("contractParentId"))) {
contractPo.setContractParentId("-1");
}
reqJson.put("userId", userId);
+
+
+ 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);
+ }
+
+
return saveContractBMOImpl.save(contractPo, reqJson);
}
@@ -191,24 +249,36 @@
@RequestMapping(value = "/updateContract", method = RequestMethod.POST)
public ResponseEntity<String> updateContract(@RequestBody JSONObject reqJson) {
- Assert.hasKeyAndValue(reqJson, "contractCode", "璇锋眰鎶ユ枃涓湭鍖呭惈contractCode");
- Assert.hasKeyAndValue(reqJson, "contractName", "璇锋眰鎶ユ枃涓湭鍖呭惈contractName");
- Assert.hasKeyAndValue(reqJson, "contractType", "璇锋眰鎶ユ枃涓湭鍖呭惈contractType");
- Assert.hasKeyAndValue(reqJson, "partyA", "璇锋眰鎶ユ枃涓湭鍖呭惈partyA");
- Assert.hasKeyAndValue(reqJson, "partyB", "璇锋眰鎶ユ枃涓湭鍖呭惈partyB");
- Assert.hasKeyAndValue(reqJson, "aContacts", "璇锋眰鎶ユ枃涓湭鍖呭惈aContacts");
- Assert.hasKeyAndValue(reqJson, "aLink", "璇锋眰鎶ユ枃涓湭鍖呭惈aLink");
- Assert.hasKeyAndValue(reqJson, "bContacts", "璇锋眰鎶ユ枃涓湭鍖呭惈bContacts");
- Assert.hasKeyAndValue(reqJson, "bLink", "璇锋眰鎶ユ枃涓湭鍖呭惈bLink");
- Assert.hasKeyAndValue(reqJson, "operator", "璇锋眰鎶ユ枃涓湭鍖呭惈operator");
- Assert.hasKeyAndValue(reqJson, "operatorLink", "璇锋眰鎶ユ枃涓湭鍖呭惈operatorLink");
- Assert.hasKeyAndValue(reqJson, "startTime", "璇锋眰鎶ユ枃涓湭鍖呭惈startTime");
- Assert.hasKeyAndValue(reqJson, "endTime", "璇锋眰鎶ユ枃涓湭鍖呭惈endTime");
- Assert.hasKeyAndValue(reqJson, "signingTime", "璇锋眰鎶ユ枃涓湭鍖呭惈signingTime");
- Assert.hasKeyAndValue(reqJson, "contractId", "contractId涓嶈兘涓虹┖");
+// Assert.hasKeyAndValue(reqJson, "contractCode", "璇锋眰鎶ユ枃涓湭鍖呭惈contractCode");
+// Assert.hasKeyAndValue(reqJson, "contractName", "璇锋眰鎶ユ枃涓湭鍖呭惈contractName");
+// Assert.hasKeyAndValue(reqJson, "contractType", "璇锋眰鎶ユ枃涓湭鍖呭惈contractType");
+// Assert.hasKeyAndValue(reqJson, "partyA", "璇锋眰鎶ユ枃涓湭鍖呭惈partyA");
+// Assert.hasKeyAndValue(reqJson, "partyB", "璇锋眰鎶ユ枃涓湭鍖呭惈partyB");
+// Assert.hasKeyAndValue(reqJson, "aContacts", "璇锋眰鎶ユ枃涓湭鍖呭惈aContacts");
+// Assert.hasKeyAndValue(reqJson, "aLink", "璇锋眰鎶ユ枃涓湭鍖呭惈aLink");
+// Assert.hasKeyAndValue(reqJson, "bContacts", "璇锋眰鎶ユ枃涓湭鍖呭惈bContacts");
+// Assert.hasKeyAndValue(reqJson, "bLink", "璇锋眰鎶ユ枃涓湭鍖呭惈bLink");
+// Assert.hasKeyAndValue(reqJson, "operator", "璇锋眰鎶ユ枃涓湭鍖呭惈operator");
+// Assert.hasKeyAndValue(reqJson, "operatorLink", "璇锋眰鎶ユ枃涓湭鍖呭惈operatorLink");
+// Assert.hasKeyAndValue(reqJson, "startTime", "璇锋眰鎶ユ枃涓湭鍖呭惈startTime");
+// Assert.hasKeyAndValue(reqJson, "endTime", "璇锋眰鎶ユ枃涓湭鍖呭惈endTime");
+// Assert.hasKeyAndValue(reqJson, "signingTime", "璇锋眰鎶ユ枃涓湭鍖呭惈signingTime");
+// Assert.hasKeyAndValue(reqJson, "contractId", "contractId涓嶈兘涓虹┖");
- ContractPo contractPo = BeanConvertUtil.covertBean(reqJson, ContractPo.class);
+ ContractDto contractPo = BeanConvertUtil.covertBean(reqJson, ContractDto.class);
+
+ JSONArray contractFiles = reqJson.getJSONArray("contractFilePo");
+ List<ContractFilePo> contractFilePos = new ArrayList<>();
+ if (contractFiles != null) {
+ 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);
return updateContractBMOImpl.update(contractPo, reqJson);
}
@@ -229,6 +299,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);
}
/**
@@ -261,7 +356,7 @@
*/
@RequestMapping(value = "/deleteContract", method = RequestMethod.POST)
public ResponseEntity<String> deleteContract(@RequestBody JSONObject reqJson) {
- Assert.hasKeyAndValue(reqJson, "communityId", "灏忓尯ID涓嶈兘涓虹┖");
+// Assert.hasKeyAndValue(reqJson, "communityId", "灏忓尯ID涓嶈兘涓虹┖");
Assert.hasKeyAndValue(reqJson, "contractId", "contractId涓嶈兘涓虹┖");
@@ -272,37 +367,9 @@
/**
- * 寰俊鍒犻櫎娑堟伅妯℃澘
- *
- * @param storeId 鍟嗘埛ID
- * @param expiration 鍒版湡鍚堝悓鏍囪 1 鍒版湡鍚堝悓
- * @return
- * @serviceCode /contract/queryContract
- * @path /app/contract/queryContract
- */
- @RequestMapping(value = "/queryContract", method = RequestMethod.GET)
- 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 = "page") int page,
- @RequestParam(value = "row") int row) {
- ContractDto contractDto = new ContractDto();
- contractDto.setPage(page);
- contractDto.setRow(row);
- contractDto.setStoreId(storeId);
- contractDto.setState(state);
- //濡傛灉鏄埌鏈熷悎鍚�
- 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
+ * @param storeId 鍟嗘埛ID
* @return
* @serviceCode /contract/queryContractTask
* @path /app/contract/queryContractTask
@@ -324,16 +391,16 @@
/**
* 鍚堝悓璧疯崏宸插姙
*
- * @param storeId 鍟嗘埛ID
+ * @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) {
+ @RequestHeader(value = "user-id") String userId,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
AuditUser auditUser = new AuditUser();
@@ -345,7 +412,50 @@
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);
+ }
/**
* 寰俊淇濆瓨娑堟伅妯℃澘
@@ -360,10 +470,12 @@
Assert.hasKeyAndValue(reqJson, "typeName", "璇锋眰鎶ユ枃涓湭鍖呭惈typeName");
Assert.hasKeyAndValue(reqJson, "audit", "璇锋眰鎶ユ枃涓湭鍖呭惈audit");
+ Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈灏忓尯缂栧彿");
ContractTypePo contractTypePo = BeanConvertUtil.covertBean(reqJson, ContractTypePo.class);
contractTypePo.setStoreId(storeId);
+ contractTypePo.setCommunityId(reqJson.getString("communityId"));
return saveContractTypeBMOImpl.save(contractTypePo);
}
@@ -416,12 +528,20 @@
*/
@RequestMapping(value = "/queryContractType", method = RequestMethod.GET)
public ResponseEntity<String> queryContractType(@RequestHeader(value = "store-id") String storeId,
+ @RequestParam(value = "audit", required = false) String audit,
+ @RequestParam(value = "typeName", required = false) String typeName,
+ @RequestParam(value = "contractTypeId", required = false) String contractTypeId,
+ @RequestParam(value = "communityId", required = false) String communityId,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
ContractTypeDto contractTypeDto = new ContractTypeDto();
contractTypeDto.setPage(page);
contractTypeDto.setRow(row);
- contractTypeDto.setStoreId(storeId);
+ contractTypeDto.setAudit(audit);
+ contractTypeDto.setTypeName(typeName);
+ contractTypeDto.setContractTypeId(contractTypeId);
+ contractTypeDto.setStoreId(null);
+ contractTypeDto.setCommunityId(communityId);
return getContractTypeBMOImpl.get(contractTypeDto);
}
@@ -507,7 +627,10 @@
* @path /app/contract/queryContractTypeSpec
*/
@RequestMapping(value = "/queryContractTypeSpec", method = RequestMethod.GET)
- public ResponseEntity<String> queryContractTypeSpec(@RequestHeader(value = "store-id") String storeId,
+ public ResponseEntity<String> queryContractTypeSpec(@RequestParam(value = "specName", required = false) String specName,
+ @RequestParam(value = "specShow", required = false) String specShow,
+ @RequestParam(value = "specCd", required = false) String specCd,
+ @RequestHeader(value = "store-id") String storeId,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row,
@RequestParam(value = "contractTypeId") String contractTypeId) {
@@ -516,6 +639,9 @@
contractTypeSpecDto.setRow(row);
contractTypeSpecDto.setStoreId(storeId);
contractTypeSpecDto.setContractTypeId(contractTypeId);
+ contractTypeSpecDto.setSpecName(specName);
+ contractTypeSpecDto.setSpecShow(specShow);
+ contractTypeSpecDto.setSpecCd(specCd);
return getContractTypeSpecBMOImpl.get(contractTypeSpecDto);
}
@@ -707,9 +833,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, reqJson);
}
/**
@@ -743,13 +887,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);
}
@@ -767,8 +911,13 @@
@RequestParam(value = "row") int row,
@RequestParam(value = "contractId", required = false) String contractId,
@RequestParam(value = "contractName", required = false) String contractName,
- @RequestParam(value = "planId", required = false) String planId
- ) {
+ @RequestParam(value = "contractCode", required = false) String contractCode,
+ @RequestParam(value = "contractType", required = false) String contractType,
+ @RequestParam(value = "logStartTime", required = false) String logStartTime,
+ @RequestParam(value = "logEndTime", required = false) String logEndTime,
+ @RequestParam(value = "staffNameLike", required = false) String staffNameLike,
+ @RequestParam(value = "communityId", required = false) String communityId,
+ @RequestParam(value = "planId", required = false) String planId) {
ContractChangePlanDto contractChangePlanDto = new ContractChangePlanDto();
contractChangePlanDto.setPage(page);
contractChangePlanDto.setRow(row);
@@ -776,9 +925,40 @@
contractChangePlanDto.setContractId(contractId);
contractChangePlanDto.setContractName(contractName);
contractChangePlanDto.setPlanId(planId);
+ contractChangePlanDto.setContractCode(contractCode);
+ contractChangePlanDto.setContractType(contractType);
+ contractChangePlanDto.setStartTime(logStartTime);
+ contractChangePlanDto.setEndTime(logEndTime);
+ contractChangePlanDto.setStaffNameLike(staffNameLike);
+ contractChangePlanDto.setCommunityId(communityId);
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.setContractId(reqJson.getString("contractId"));
+ contractChangePlanDto.setStoreId(storeId);
+ contractChangePlanDto.setAuditCode(reqJson.getString("state"));
+ contractChangePlanDto.setAuditMessage(reqJson.getString("remark"));
+ contractChangePlanDto.setCurrentUserId(userId);
+
+ return updateContractBMOImpl.needAuditContractPlan(contractChangePlanDto, reqJson);
+ }
/**
* 寰俊淇濆瓨娑堟伅妯℃澘
@@ -797,10 +977,10 @@
Assert.hasKeyAndValue(reqJson, "contractType", "璇锋眰鎶ユ枃涓湭鍖呭惈contractType");
Assert.hasKeyAndValue(reqJson, "partyA", "璇锋眰鎶ユ枃涓湭鍖呭惈partyA");
Assert.hasKeyAndValue(reqJson, "partyB", "璇锋眰鎶ユ枃涓湭鍖呭惈partyB");
- Assert.hasKeyAndValue(reqJson, "aContacts", "璇锋眰鎶ユ枃涓湭鍖呭惈aContacts");
- Assert.hasKeyAndValue(reqJson, "aLink", "璇锋眰鎶ユ枃涓湭鍖呭惈aLink");
- Assert.hasKeyAndValue(reqJson, "bContacts", "璇锋眰鎶ユ枃涓湭鍖呭惈bContacts");
- Assert.hasKeyAndValue(reqJson, "bLink", "璇锋眰鎶ユ枃涓湭鍖呭惈bLink");
+// Assert.hasKeyAndValue(reqJson, "aContacts", "璇锋眰鎶ユ枃涓湭鍖呭惈aContacts");
+// Assert.hasKeyAndValue(reqJson, "aLink", "璇锋眰鎶ユ枃涓湭鍖呭惈aLink");
+// Assert.hasKeyAndValue(reqJson, "bContacts", "璇锋眰鎶ユ枃涓湭鍖呭惈bContacts");
+// Assert.hasKeyAndValue(reqJson, "bLink", "璇锋眰鎶ユ枃涓湭鍖呭惈bLink");
Assert.hasKeyAndValue(reqJson, "operator", "璇锋眰鎶ユ枃涓湭鍖呭惈operator");
Assert.hasKeyAndValue(reqJson, "operatorLink", "璇锋眰鎶ユ枃涓湭鍖呭惈operatorLink");
Assert.hasKeyAndValue(reqJson, "startTime", "璇锋眰鎶ユ枃涓湭鍖呭惈startTime");
@@ -829,10 +1009,10 @@
Assert.hasKeyAndValue(reqJson, "contractType", "璇锋眰鎶ユ枃涓湭鍖呭惈contractType");
Assert.hasKeyAndValue(reqJson, "partyA", "璇锋眰鎶ユ枃涓湭鍖呭惈partyA");
Assert.hasKeyAndValue(reqJson, "partyB", "璇锋眰鎶ユ枃涓湭鍖呭惈partyB");
- Assert.hasKeyAndValue(reqJson, "aContacts", "璇锋眰鎶ユ枃涓湭鍖呭惈aContacts");
- Assert.hasKeyAndValue(reqJson, "aLink", "璇锋眰鎶ユ枃涓湭鍖呭惈aLink");
- Assert.hasKeyAndValue(reqJson, "bContacts", "璇锋眰鎶ユ枃涓湭鍖呭惈bContacts");
- Assert.hasKeyAndValue(reqJson, "bLink", "璇锋眰鎶ユ枃涓湭鍖呭惈bLink");
+// Assert.hasKeyAndValue(reqJson, "aContacts", "璇锋眰鎶ユ枃涓湭鍖呭惈aContacts");
+// Assert.hasKeyAndValue(reqJson, "aLink", "璇锋眰鎶ユ枃涓湭鍖呭惈aLink");
+// Assert.hasKeyAndValue(reqJson, "bContacts", "璇锋眰鎶ユ枃涓湭鍖呭惈bContacts");
+// Assert.hasKeyAndValue(reqJson, "bLink", "璇锋眰鎶ユ枃涓湭鍖呭惈bLink");
Assert.hasKeyAndValue(reqJson, "operator", "璇锋眰鎶ユ枃涓湭鍖呭惈operator");
Assert.hasKeyAndValue(reqJson, "operatorLink", "璇锋眰鎶ユ枃涓湭鍖呭惈operatorLink");
Assert.hasKeyAndValue(reqJson, "startTime", "璇锋眰鎶ユ枃涓湭鍖呭惈startTime");
@@ -1000,8 +1180,175 @@
contractTypeSpecDto.setStoreId(storeId);
contractTypeSpecDto.setContractTypeId(contractTypeId);
- return printContractTemplateBMO.get(contractTypeTemplateDto,contractDto,contractTypeSpecDto);
+ 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);
+ }
+
+
+ /**
+ * 寰俊淇濆瓨娑堟伅妯℃澘
+ *
+ * @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