车辆预定重新排班bug

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

@@ -464,6 +464,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
                throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_NOT_EXIST.getDesc(), ResCode.VEHICLE_BOOKED_RECORD_NOT_EXIST.getCode());
            } else {
                //先取消预定，然后再修改
+               //先取消之前预定时间，然后再修改
                bookVehicleVo.setUnbookStartDate(new DateTime(vehicleBookRecord.getBookStartDate()).toString(DATE_TIME_FORMATTER));
                bookVehicleVo.setUnbookEndDate(new DateTime(vehicleBookRecord.getBookEndDate()).toString(DATE_TIME_FORMATTER));
                unbookVehicle(bookVehicleVo);
@@ -528,7 +529,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         Integer andOperationFactor = andOpratorParam.get("andOperationFactor");
         Integer andOperationRs = andOpratorParam.get("andOperationRs");
         if(vehicleBookInfo != null && vehicleBookInfo.getBookedDate() != null &&
-                ((vehicleBookInfo.getBookedDate() & andOperationFactor) != 0)){//已经被预定
+                ((vehicleBookInfo.getBookedDate() & andOperationFactor) != andOperationRs)){//已经被预定
             //当天已经被预定检查小时是否也被预定
             return filterHourInfoBooked(vehicleId, hourInfo);
         }
@@ -541,8 +542,17 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
             VehicleBookHourInfoDto vehicleBookHourInfoDto = new VehicleBookHourInfoDto();
             vehicleBookHourInfoDto.setYearMonthDay(entry.getKey());
             vehicleBookHourInfoDto.setVehicleId(vehicleId);
+            if(entry.getValue() == 0) {//0点 查询是否有已经预约的记录
+                Map<String, Object> param = new HashMap<>();
+                param.put("vehicleId", vehicleId);
+                param.put("bookedEndDate", DateTime.parse(entry.getKey() + " 00:00:00", DATE_TIME_FORMATTER));
+                List<VehicleBookRecordVo> vehicleBookRecordVos = vehicleBookRecordBiz.selectZeroHourRecord(param);
+                if(vehicleBookRecordVos != null && vehicleBookRecordVos.size() > 0) {
+                    return false;
+                }
+            }
             List<VehicleBookHourInfo> vehicleBookHourInfos = vehicleBookHourInfoBiz.selectByVehicleAndDate(vehicleBookHourInfoDto);
-            if(vehicleBookHourInfos != null && vehicleBookHourInfos.size() >0) {
+            if(vehicleBookHourInfos != null && vehicleBookHourInfos.size() > 0) {
                 if((vehicleBookHourInfos.get(0).getBookedHour() & entry.getValue()) != 0) { // 已经被预定
                     log.info(entry.getKey() + "预定的时间段已经被预约！");
                     return Boolean.FALSE;

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

@@ -93,6 +93,12 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
         return list;
     }
 
+    public List<VehicleBookRecordVo> selectZeroHourRecord(Map<String, Object> param) {
+        List<VehicleBookRecordVo> list = mapper.selectZeroHourRecord(param);
+        removeStatus2(list);
+        return list;
+    }
+
     public int changeRecordStatus(Map<String, Object> updateParam) {
         return mapper.changeRecordStatus(updateParam);
     }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleBookRecordMapper.java

@@ -37,4 +37,7 @@ public interface VehicleBookRecordMapper extends Mapper<VehicleBookRecord> {
     public List<VehicleBookRecordVo> getBookRecordInfo(Map<String, Object> param);
 
     public List<VehicleBookRecordVo> selectByVehicleIdAndTime(Map<String, Object> param);
+
+    public List<VehicleBookRecordVo> selectZeroHourRecord(Map<String, Object> param);
+
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleBookRecordMapper.xml

@@ -330,6 +330,13 @@
          where v1.vehicle_id = #{vehicleId}   and v1.book_end_date <= #{bookedEndDate} and v1.status BETWEEN 1 and 2
     </select>
 
+    <select id="selectZeroHourRecord" resultMap="searchBookRecord" parameterType="java.util.Map">
+        select v1.* from vehicle_book_record v1
+         where v1.vehicle_id = #{vehicleId}
+         and (v1.book_end_date = #{bookedEndDate} or v1.book_start_date = #{bookedEndDate})
+         and v1.status BETWEEN 1 and 2
+    </select>
+
     <select id="getById" parameterType="java.util.Map" resultType="com.xxfc.platform.vehicle.entity.VehicleBookRecord">
         select
             vbr.`id`,