包租协议，启用时间和到期时间不在范围内的提示用弹窗显示

src/main/java/com/qmrb/system/controller/ContractPlaceNumberRelController.java

@@ -72,10 +72,10 @@ public class ContractPlaceNumberRelController {
 
     @Autowired
     IContractPlaceNumberRelHisService contractPlaceNumberRelHisService;
-    
+
     @Autowired
     IVirtualParkingSlotService virtualParkingSlotService;
-    
+
     @Autowired
     IContractService contractService;
 
@@ -104,10 +104,10 @@ public class ContractPlaceNumberRelController {
         Contract contract = contractService.getById(form.getContractId());
         Date startOfDay = DateUtils.getStartOfDay(contract.getStartDate());
         Date endOfDay = DateUtils.getEndOfDay(contract.getEndDate());
-        if(form.getStartTime().before(startOfDay) || form.getStartTime().after(endOfDay)){
+        if (form.getStartTime().before(startOfDay) || form.getStartTime().after(endOfDay)) {
             return Result.failed("启用时间在包租协议有效期外");
         }
-        if(form.getEndTime().before(startOfDay) || form.getEndTime().after(endOfDay)){
+        if (form.getEndTime().before(startOfDay) || form.getEndTime().after(endOfDay)) {
             return Result.failed("到期时间在包租协议有效期外");
         }
         ContractPlaceNumberRelForm result = contractPlaceNumberRelService.saveForm(form);
@@ -128,12 +128,15 @@ public class ContractPlaceNumberRelController {
         Contract contract = contractService.getById(form.getContractId());
         Date startOfDay = DateUtils.getStartOfDay(contract.getStartDate());
         Date endOfDay = DateUtils.getEndOfDay(contract.getEndDate());
-        log.info("修改协议(客商)车牌关系:====>{}--{}",startOfDay,endOfDay);
-        if(form.getStartTime().before(startOfDay) || form.getStartTime().after(endOfDay)){
-            return Result.failed("启用时间在包租协议有效期外");
+        log.info("修改协议(客商)车牌关系:====>{}--{}", startOfDay, endOfDay);
+        if (form.getStartTime().before(startOfDay) || form.getStartTime().after(endOfDay)) {
+            // return Result.failed("启用时间在包租协议有效期外");
+
+            return Result.failed(ResultCode.SUCCESS, "启用时间在包租协议有效期外");
         }
-        if(form.getEndTime().before(startOfDay) || form.getEndTime().after(endOfDay)){
-            return Result.failed("到期时间在包租协议有效期外");
+        if (form.getEndTime().before(startOfDay) || form.getEndTime().after(endOfDay)) {
+            return Result.failed(ResultCode.SUCCESS, "到期时间在包租协议有效期外");
+            // return Result.failed("到期时间在包租协议有效期外");
         }
         boolean result = contractPlaceNumberRelService.updateForm(id, form);
         return Result.judge(result);
@@ -150,7 +153,7 @@ public class ContractPlaceNumberRelController {
                 .map(idStr -> Long.parseLong(idStr)).collect(Collectors.toList());
         List<ContractPlaceNumberRel> contractPlaceNumberRels = contractPlaceNumberRelService.listByIds(idList);
         if (CollectionUtil.isNotEmpty(idList)) {
-            ArrayList<String > virtualSlotNumbers = new ArrayList<>();
+            ArrayList<String> virtualSlotNumbers = new ArrayList<>();
             for (ContractPlaceNumberRel contractPlaceNumberRel : contractPlaceNumberRels) {
                 // 更新历史记录表
                 ContractPlaceNumberRelHis contractPlaceNumberRelHis = new ContractPlaceNumberRelHis();
@@ -170,7 +173,7 @@ public class ContractPlaceNumberRelController {
             );
 
         }
-        
+
         // boolean result = contractPlaceNumberRelService.removeByIds(idList);
         boolean result = contractPlaceNumberRelService.update(
                 new LambdaUpdateWrapper<ContractPlaceNumberRel>()