Pārlūkot izejas kodu

虚拟车位类型

guoshuai 1 dienu atpakaļ
vecāks
revīzija
4927884e95

+ 3 - 2
src/main/java/com/qmrb/system/service/impl/ContractServiceImpl.java

@@ -169,8 +169,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
 
         Contract entity = converter.form2Entity(form);
         // 保存虚拟车位
-        if(form.getMaxParkingLotNum()!= null && contract.getMaxParkingLotNum() != null && !form.getMaxParkingLotNum().equals(contract.getMaxParkingLotNum()) &&
-        form.getSmallParkingLotNum()!= null && contract.getSmallParkingLotNum() != null && !form.getSmallParkingLotNum().equals(contract.getSmallParkingLotNum()) 
+        if(form.getMaxParkingLotNum()!= null && contract.getMaxParkingLotNum() != null 
+                && form.getSmallParkingLotNum()!= null && contract.getSmallParkingLotNum() != null 
+                && (!form.getMaxParkingLotNum().equals(contract.getMaxParkingLotNum())  || !form.getSmallParkingLotNum().equals(contract.getSmallParkingLotNum()) ) 
         ){
             virtualParkingSlotService.createFormsByContract(entity);
         }

+ 3 - 0
src/main/java/com/qmrb/system/service/impl/VirtualParkingSlotServiceImpl.java

@@ -115,6 +115,9 @@ public class VirtualParkingSlotServiceImpl extends ServiceImpl<VirtualParkingSlo
 				updateSlotType(list,contract);
 				this.updateBatchById(list);
 				
+			}else if(contract.getMaxParkingLotNum()==list.size()){
+				updateSlotType(list,contract);
+				this.updateBatchById(list);
 			}else if(contract.getMaxParkingLotNum()>list.size() && contract.getMaxParkingLotNum() < allVirtuals.size()){
 				ArrayList<VirtualParkingSlot> virtualParkingSlots = new ArrayList<>();
 				// 如果包租协议最大车位数大于启用虚拟车位,但小于总虚拟车位