From bd0a76ccce4278c3c36eb05d33bfc5c23f1f782e Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 11 十月 2022 01:44:56 +0800
Subject: [PATCH] 和优化代码
---
service-store/src/main/java/com/java110/store/bmo/contract/impl/UpdateContractBMOImpl.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 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 78326d9..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,7 +18,13 @@
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;
@@ -185,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) {
@@ -205,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();
@@ -239,10 +249,12 @@
doDelOldRoomRel(contractChangePlanRoomDtos, oldContractRoomDtos);
return;
}
- doAddRoomRel(contractDto, oldContractRoomDtos, contractChangePlanRoomDtos);
-
//鍒犻櫎鑰佺殑鍏崇郴鍊�
doDelOldRoomRel(contractChangePlanRoomDtos, oldContractRoomDtos);
+ //澧炲姞
+ doAddRoomRel(contractDto, oldContractRoomDtos, contractChangePlanRoomDtos);
+
+
}
@@ -365,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;
}
@@ -379,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;
}
--
Gitblit v1.8.0