From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-store/src/main/java/com/java110/store/bmo/contract/impl/UpdateContractBMOImpl.java | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/bmo/contract/impl/UpdateContractBMOImpl.java b/service-store/src/main/java/com/java110/store/bmo/contract/impl/UpdateContractBMOImpl.java
index f50e2d4..149a5e9 100755
--- a/service-store/src/main/java/com/java110/store/bmo/contract/impl/UpdateContractBMOImpl.java
+++ b/service-store/src/main/java/com/java110/store/bmo/contract/impl/UpdateContractBMOImpl.java
@@ -18,13 +18,18 @@
import com.java110.intf.common.IContractApplyUserInnerServiceSMO;
import com.java110.intf.common.IContractChangeUserInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
-import com.java110.intf.store.*;
+import com.java110.intf.store.IContractAttrInnerServiceSMO;
+import com.java110.intf.store.IContractChangePlanDetailInnerServiceSMO;
+import com.java110.intf.store.IContractChangePlanInnerServiceSMO;
+import com.java110.intf.store.IContractChangePlanRoomInnerServiceSMO;
+import com.java110.intf.store.IContractFileInnerServiceSMO;
+import com.java110.intf.store.IContractInnerServiceSMO;
+import com.java110.intf.store.IContractRoomInnerServiceSMO;
import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
import com.java110.intf.user.IRentingPoolInnerServiceSMO;
import com.java110.po.contract.ContractPo;
import com.java110.po.contractAttr.ContractAttrPo;
import com.java110.po.contractChangePlan.ContractChangePlanPo;
-import com.java110.po.contractChangePlanRoom.ContractChangePlanRoomPo;
import com.java110.po.contractFile.ContractFilePo;
import com.java110.po.contractRoom.ContractRoomPo;
import com.java110.po.owner.OwnerRoomRelPo;
@@ -37,7 +42,6 @@
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
-import org.apache.http.annotation.Contract;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
@@ -108,7 +112,7 @@
deleteContractFileBMOImpl.delete(contractFilePo);
List<ContractFilePo> filePos = contractPo.getContractFilePo();
- if(filePos != null) {
+ if (filePos != null) {
for (ContractFilePo file : filePos) {
if (file.getFileRealName().length() > 0 && file.getFileSaveName().length() > 0) {
file.setContractId(contractPo.getContractId());
@@ -148,6 +152,7 @@
List<ContractDto> contractDtos = contractInnerServiceSMOImpl.queryContracts(tmpContractDto);
Assert.listOnlyOne(contractDtos, "鍚堝悓涓嶅瓨鍦�");
contractDto.setStartUserId(contractDtos.get(0).getStartUserId());
+ contractDto.setNextUserId(reqJson.getString("nextUserId"));
boolean isLastTask = contractApplyUserInnerServiceSMOImpl.completeTask(contractDto);
if (isLastTask) {
@@ -160,6 +165,9 @@
ContractPo contractPo = new ContractPo();
contractPo.setContractId(contractDto.getContractId());
contractPo.setState(ContractDto.STATE_AUDIT_DOING);
+ if ("1200".equals(reqJson.getString("state"))) {
+ contractPo.setState(ContractDto.STATE_FAIL);
+ }
contractPo.setStatusCd(StatusConstant.STATUS_CD_VALID);
contractInnerServiceSMOImpl.updateContract(contractPo);
}
@@ -183,6 +191,7 @@
List<ContractChangePlanDto> contractChangePlanDtos = contractChangePlanInnerServiceSMOImpl.queryContractChangePlans(tmpContractChangePlanDto);
Assert.listOnlyOne(contractChangePlanDtos, "鍚堝悓璁″垝涓嶅瓨鍦�");
contractChangePlanDto.setStartUserId(contractChangePlanDtos.get(0).getChangePerson());
+ contractChangePlanDto.setNextUserId(reqJson.getString("nextUserId"));
boolean isLastTask = contractChangeUserInnerServiceSMOImpl.completeTask(contractChangePlanDto);
if (isLastTask) {
@@ -203,7 +212,10 @@
ContractPo contractPo = BeanConvertUtil.covertBean(contractChangePlanDetailDtos.get(0), ContractPo.class);
contractInnerServiceSMOImpl.updateContract(contractPo);
- dealContractChangePlanRoom(contractChangePlanDto,contractDtos.get(0));
+ //瑙ｅ喅鍚堝悓bug 鍙湁 璧勪骇鍙樻洿鏃� 鎿嶄綔 鍚堝悓鎴垮眿
+ if (ContractChangePlanDto.PLAN_TYPE_CHANGE_ROOM.equals(contractChangePlanDtos.get(0).getPlanType())) {
+ dealContractChangePlanRoom(contractChangePlanDto, contractDtos.get(0));
+ }
} else { //淇敼涓哄鏍镐腑
ContractChangePlanPo contractChangePlanPo = new ContractChangePlanPo();
@@ -237,10 +249,12 @@
doDelOldRoomRel(contractChangePlanRoomDtos, oldContractRoomDtos);
return;
}
- doAddRoomRel(contractDto, oldContractRoomDtos, contractChangePlanRoomDtos);
-
//鍒犻櫎鑰佺殑鍏崇郴鍊�
doDelOldRoomRel(contractChangePlanRoomDtos, oldContractRoomDtos);
+ //澧炲姞
+ doAddRoomRel(contractDto, oldContractRoomDtos, contractChangePlanRoomDtos);
+
+
}
@@ -363,7 +377,7 @@
}
private boolean isDelOldRoom(ContractRoomDto oldContractRoomDto, List<ContractChangePlanRoomDto> contractChangePlanRoomDtos) {
- if (contractChangePlanRoomDtos == null || contractChangePlanRoomDtos.size() > 0) {
+ if (contractChangePlanRoomDtos == null || contractChangePlanRoomDtos.size() < 1) {
return false;
}
@@ -377,7 +391,7 @@
}
private boolean isOldRoom(ContractChangePlanRoomDto tmpContractChangePlanRoomDto, List<ContractRoomDto> oldContractRoomDtos) {
- if (oldContractRoomDtos == null || oldContractRoomDtos.size() > 0) {
+ if (oldContractRoomDtos == null || oldContractRoomDtos.size() < 1) {
return false;
}
@@ -389,6 +403,7 @@
return false;
}
+
private void updateContractAttr(JSONObject jsonObject, ContractPo contractPo) {
ContractAttrDto contractAttrDto = new ContractAttrDto();
contractAttrDto.setContractId(contractPo.getContractId());
--
Gitblit v1.8.0