Merge branch 'dev' into base-modify

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -437,17 +437,18 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
             throw new BaseException(ResultCode.ONLY_BOOK_TWO_MONTH);
         }
         //检验时间是否可以预定
-        Map<String, Integer> map = vehicleBookHourInfoBiz.getPredictableHours(bookVehicleVo.getBookStartDate(), bookVehicleVo.getBookEndDate(), bookVehicleVo.getNotCheckTimeLegal());
-        for(Map.Entry<String,List<String>> entry:yearMonthAndDate.entrySet()){
-            Boolean rsEach = applyVehicle4EmployeePerMonth(bookVehicleVo.getVehicleId(),entry.getValue(),entry.getKey(), map);
-            if(Boolean.FALSE.equals(rsEach)){
-                throw new BaseException(ResultCode.VEHICLE_IS_BOOKED);
-            }
-        }
 
+        Map<String, Integer> map = new HashMap<>();
         //加入预定申请记录
         VehicleBookRecord vehicleBookRecord = null;
         if(bookVehicleVo.getVehicleBookRecordId() == null) {
+            map  = vehicleBookHourInfoBiz.getPredictableHours(bookVehicleVo.getBookStartDate(), bookVehicleVo.getBookEndDate(), bookVehicleVo.getNotCheckTimeLegal());
+            for(Map.Entry<String,List<String>> entry:yearMonthAndDate.entrySet()){
+                Boolean rsEach = applyVehicle4EmployeePerMonth(bookVehicleVo.getVehicleId(),entry.getValue(),entry.getKey(), map);
+                if(Boolean.FALSE.equals(rsEach)){
+                    throw new BaseException(ResultCode.VEHICLE_IS_BOOKED);
+                }
+            }
             vehicleBookRecord = new VehicleBookRecord();
             BeanUtil.copyProperties(bookVehicleVo, vehicleBookRecord, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
             vehicleBookRecord.setBookStartDate(startDay.toDate());
@@ -468,6 +469,13 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
                bookVehicleVo.setUnbookEndDate(new DateTime(vehicleBookRecord.getBookEndDate()).toString(DATE_TIME_FORMATTER));
                unbookVehicle(bookVehicleVo);
 
+               map  = vehicleBookHourInfoBiz.getPredictableHours(bookVehicleVo.getBookStartDate(), bookVehicleVo.getBookEndDate(), bookVehicleVo.getNotCheckTimeLegal());
+               for(Map.Entry<String,List<String>> entry:yearMonthAndDate.entrySet()){
+                   Boolean rsEach = applyVehicle4EmployeePerMonth(bookVehicleVo.getVehicleId(),entry.getValue(),entry.getKey(), map);
+                   if(Boolean.FALSE.equals(rsEach)){
+                       throw new BaseException(ResultCode.VEHICLE_IS_BOOKED);
+                   }
+               }
                vehicleBookRecord.setBookStartDate(startDay.toDate());
                vehicleBookRecord.setBookEndDate(endDay.toDate());
                vehicleBookRecordBiz.updateSelectiveByIdRe(vehicleBookRecord);