From 688be4ce73ddf710a0acb4769e8fdb7394116434 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 16 五月 2022 19:07:47 +0800
Subject: [PATCH] 优化合同功能

---
 service-store/src/main/java/com/java110/store/bmo/contract/impl/UpdateContractBMOImpl.java |   20 ++++++++++++++------
 1 files changed, 14 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 a5a49fa..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;
@@ -207,7 +213,7 @@
 
             contractInnerServiceSMOImpl.updateContract(contractPo);
             //瑙e喅鍚堝悓bug 鍙湁 璧勪骇鍙樻洿鏃� 鎿嶄綔 鍚堝悓鎴垮眿
-            if(ContractChangePlanDto.PLAN_TYPE_CHANGE_ROOM.equals(contractChangePlanDtos.get(0).getPlanType())){
+            if (ContractChangePlanDto.PLAN_TYPE_CHANGE_ROOM.equals(contractChangePlanDtos.get(0).getPlanType())) {
                 dealContractChangePlanRoom(contractChangePlanDto, contractDtos.get(0));
             }
 
@@ -243,10 +249,12 @@
             doDelOldRoomRel(contractChangePlanRoomDtos, oldContractRoomDtos);
             return;
         }
-        doAddRoomRel(contractDto, oldContractRoomDtos, contractChangePlanRoomDtos);
-
         //鍒犻櫎鑰佺殑鍏崇郴鍊�
         doDelOldRoomRel(contractChangePlanRoomDtos, oldContractRoomDtos);
+        //澧炲姞
+        doAddRoomRel(contractDto, oldContractRoomDtos, contractChangePlanRoomDtos);
+
+
 
 
     }
@@ -369,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;
         }
 
@@ -383,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