补充以前未收车预定记录

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

@@ -640,6 +640,8 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
         return pageDataVO;
     }
 
+
+
     private String getTbNameNow() {
         return TB_NAME_PREFIX + DateTime.now().toString(YEAR_DATE_TIME_FORMATTER);
     }

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

@@ -12,10 +12,13 @@ import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.entity.VehicleDepartureLog;
 import com.xxfc.platform.vehicle.mapper.VehicleDepartureLogMapper;
 import com.xxfc.platform.vehicle.mapper.VehicleMapper;
-import com.xxfc.platform.vehicle.pojo.DepartureLogVo;
+import com.xxfc.platform.vehicle.pojo.VehicleBookRecordVo;
 import com.xxfc.platform.vehicle.pojo.VehicleDepartureLogVo;
 import com.xxfc.platform.vehicle.pojo.VehicleDepartureStatisticDataVo;
 import lombok.extern.slf4j.Slf4j;
+import org.joda.time.DateTime;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -34,6 +37,12 @@ public class VehicleDepartureService extends BaseBiz<VehicleDepartureLogMapper,
     @Autowired
     VehicleMapper vehicleMapper;
 
+    @Autowired
+    VehicleBookRecordBiz vehicleBookRecordBiz;
+
+    public static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
+
+
     public PageInfo<VehicleDepartureLogVo> page(String numberPlate,Integer code,Integer zoneId,Integer departureId, String startTime,String endTime, Integer page, Integer limit) {
         PageHelper.startPage(page, limit);
         return new PageInfo<>(mapper.selectVoAll(numberPlate,code,zoneId,departureId,startTime, endTime));
@@ -136,4 +145,26 @@ public class VehicleDepartureService extends BaseBiz<VehicleDepartureLogMapper,
     }
 
 
+    public ObjectRestResponse updateDepartureLog() {
+       List<VehicleBookRecordVo> list = vehicleBookRecordBiz.selectAllBookRecord(DateTime.parse("2019-01-01 00:00:00", DATE_TIME_FORMATTER).toDate(), DateTime.parse("2019-11-01 00:00:00", DATE_TIME_FORMATTER).toDate(), 2).getData();
+        if (list != null && list.size() > 0) {
+            list.parallelStream().forEach(result -> {
+                if (result.getVehicleDepartureLogVo() != null && result.getVehicleDepartureLogVo().getState() == 0) {//出行中
+                    VehicleDepartureLogVo vehicleDepartureLogVo = result.getVehicleDepartureLogVo();
+                    VehicleDepartureLog vehicleDepartureLog = new VehicleDepartureLog();
+                    BeanUtil.copyProperties(vehicleDepartureLogVo, vehicleDepartureLog, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+                    vehicleDepartureLog.setRecycleMan(vehicleDepartureLogVo.getCheckMan());
+                    vehicleDepartureLog.setRecycleManTel(vehicleDepartureLogVo.getCheckManTel());
+                    vehicleDepartureLog.setArrivalTime(result.getBookEndDate());
+                    vehicleDepartureLog.setMileageEnd(vehicleDepartureLogVo.getMileageStart());
+                    vehicleDepartureLog.setArrivalBranchCompanyId(result.getRetCompany());
+                    vehicleDepartureLog.setArrivalRemark("补充之前未完成记录 补充时间：" + DateTime.now().toString(DATE_TIME_FORMATTER));
+                    vehicleDepartureLog.setState(1);
+                    updateSelectiveByIdRe(vehicleDepartureLog);
+                }
+            });
+        }
+        return ObjectRestResponse.succ();
+    }
+
 }

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

@@ -147,5 +147,11 @@ public class VehicleDepartureController {
         return vehicleDepartureService.collect(vdl);
     }
 
+    @GetMapping("/app/unauth/update")
+    @IgnoreUserToken
+    @IgnoreClientToken
+    public ObjectRestResponse updateDepartureLog() {
+        return vehicleDepartureService.updateDepartureLog();
+    }
 
 }