出车还车bug公司

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

@@ -356,26 +356,27 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
                 Map<String, Integer> map = vehicleBookHourInfoBiz.getPredictableHours(DateUtil.dateToStr(vehicleBookRecord.getBookStartDate(), "yyyy-MM-dd HH:mm:ss"), DateUtil.dateToStr(vehicleBookRecord.getBookStartDate(), "yyyy-MM-dd HH:mm:ss"), Boolean.TRUE);
                 log.info("转换为时间二进制：map = {}", map);
                 //检验数据有效性
-                for(Map.Entry<String, Integer> entry : map.entrySet()) {
-                    VehicleBookHourInfoDto vehicleBookHourInfoDto = new VehicleBookHourInfoDto();
-                    vehicleBookHourInfoDto.setVehicleId(vehicleBookRecord.getVehicleId());
-                    vehicleBookHourInfoDto.setYearMonthDay(entry.getKey());
-                    List<VehicleBookHourInfo> vehicleBookHourInfos = vehicleBookHourInfoBiz.selectByVehicleAndDate(vehicleBookHourInfoDto);
-                    log.info("预定时间信息：vehicleBookHourInfos = {}", vehicleBookHourInfos);
-                    if(vehicleBookHourInfos != null && vehicleBookHourInfos.size() > 0) {
-                        //检验数据是否存在
-                        if((vehicleBookHourInfos.get(0).getBookedHour() & entry.getValue()) == entry.getValue()) {
-                            log.info("时间正确，已经存在");
-                        } else {
-                            log.info("时间不正确");
-                            vehicleBookHourInfos.get(0).setBookedHour((vehicleBookHourInfos.get(0).getBookedHour() | entry.getValue()));
-                            log.info("更新预定时间数据：vehicleBookHourInfos = {}", vehicleBookHourInfos);
-                            vehicleBookHourInfoBiz.updateSelectiveByIdRe(vehicleBookHourInfos.get(0));
-                            unRightList.add(vehicleBookRecord);
+                if(vehicleBookRecord.getStatus() <= 2) {
+                    for(Map.Entry<String, Integer> entry : map.entrySet()) {
+                        VehicleBookHourInfoDto vehicleBookHourInfoDto = new VehicleBookHourInfoDto();
+                        vehicleBookHourInfoDto.setVehicleId(vehicleBookRecord.getVehicleId());
+                        vehicleBookHourInfoDto.setYearMonthDay(entry.getKey());
+                        List<VehicleBookHourInfo> vehicleBookHourInfos = vehicleBookHourInfoBiz.selectByVehicleAndDate(vehicleBookHourInfoDto);
+                        log.info("预定时间信息：vehicleBookHourInfos = {}", vehicleBookHourInfos);
+                        if(vehicleBookHourInfos != null && vehicleBookHourInfos.size() > 0) {
+                            //检验数据是否存在
+                            if((vehicleBookHourInfos.get(0).getBookedHour() & entry.getValue()) == entry.getValue()) {
+                                log.info("时间正确，已经存在");
+                            } else {
+                                log.info("时间不正确");
+                                vehicleBookHourInfos.get(0).setBookedHour((vehicleBookHourInfos.get(0).getBookedHour() | entry.getValue()));
+                                log.info("更新预定时间数据：vehicleBookHourInfos = {}", vehicleBookHourInfos);
+                                vehicleBookHourInfoBiz.updateSelectiveByIdRe(vehicleBookHourInfos.get(0));
+                                unRightList.add(vehicleBookRecord);
+                            }
                         }
                     }
                 }
-
             }
 
         }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java

@@ -209,6 +209,7 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
         Integer operatorId = Integer.parseInt(BaseContextHandler.getUserID());
         String userName = BaseContextHandler.getName();
         bookVehicleVo.setStatus(VehicleBookRecordStatus.APPROVE.getCode());
+        bookVehicleVo.setNotCheckTimeLegal(Boolean.TRUE);
         baseBiz.applyVehicle(operatorId, bookVehicleVo, userName);
         return RestResponse.suc();
     }
@@ -225,6 +226,7 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
         Integer operatorId = Integer.parseInt(BaseContextHandler.getUserID());
         String userName = BaseContextHandler.getName();
         bookVehicleVo.setStatus(VehicleBookRecordStatus.APPLY.getCode());
+        bookVehicleVo.setNotCheckTimeLegal(Boolean.FALSE);
         baseBiz.applyVehicle(operatorId, bookVehicleVo, userName);
         return RestResponse.suc();
     }