添加时间数据更新

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleDepartureLog.java

@@ -87,7 +87,7 @@ public class VehicleDepartureLog {
     /**
      * 预约记录id
      */
-    Integer bookRecordId;
+    Long bookRecordId;
     //违章图片，逗号分隔
     String illegalPic;
     //违章金额

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleArrivalVo.java

@@ -38,6 +38,6 @@ public class VehicleArrivalVo {
     //违章金额
     Integer illegalAmount;
 
-    Integer bookRecordId;
+    Long bookRecordId;
 
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleDepartureVo.java

@@ -48,7 +48,7 @@ public class VehicleDepartureVo {
     /**
      * 预约记录id
      */
-    Integer bookRecordId;
+    Long bookRecordId;
 
     //出车图片
     String departurePic;

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

@@ -75,6 +75,8 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
 
     @Autowired
     VehicleBookHourInfoBiz vehicleBookHourInfoBiz;
+    @Autowired
+    VehicleDepartureService vehicleDepartureService;
 
     @Override
     public UserFeign getUserFeign() {
@@ -356,23 +358,26 @@ 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);
                 //检验数据有效性
-                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);
+                if(vehicleBookRecord.getStatus() == 2) {
+                    VehicleDepartureLogVo vehicleDepartureLog = vehicleDepartureService.getByRecordId(vehicleBookRecord.getId());
+                    if(vehicleDepartureLog == null || vehicleDepartureLog.getState() != 1) { //未出车或未还车
+                        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/biz/VehicleDepartureService.java

@@ -50,6 +50,10 @@ public class VehicleDepartureService extends BaseBiz<VehicleDepartureLogMapper,
         return new PageInfo<>(mapper.selectByVehicleId(vehicleId));
     }
 
+    public VehicleDepartureLogVo getByRecordId(Long vehicleBookRecordId) {
+        return mapper.selectByBookRecordId(vehicleBookRecordId);
+    }
+
     public VehicleDepartureStatisticDataVo statistic(String numberPlate) {
         Vehicle vehicle = vehicleMapper.selectByNumberPlate(numberPlate);
         if (vehicle == null) {

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

@@ -22,5 +22,5 @@ public interface VehicleDepartureLogMapper extends BaseMapper<VehicleDepartureLo
 
     String selectDayByVehicleId(String vehicleId);
 
-    VehicleDepartureLogVo selectByBookRecordId(Integer bookRecordId);
+    VehicleDepartureLogVo selectByBookRecordId(Long bookRecordId);
 }

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

@@ -485,7 +485,7 @@
             and v1.book_user != -2
         </where>
         group by v1.id
-        order by book_start_date DESC
+        order by create_time DESC
     </select>
 
 

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

@@ -17,7 +17,7 @@
         order by create_time desc
     </select>
 
-    <select id="selectByBookRecordId" parameterType="java.lang.Integer" resultType="com.xxfc.platform.vehicle.pojo.VehicleDepartureLogVo">
+    <select id="selectByBookRecordId" parameterType="java.lang.Long" resultType="com.xxfc.platform.vehicle.pojo.VehicleDepartureLogVo">
         select vehicle_departure_log.*
         from vehicle_departure_log
         where vehicle_departure_log.book_record_id = #{id}