添加出车日志

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

@@ -251,14 +251,18 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
         if(vehicleBookRecord != null) {
             vehicleBookRecord.setRetCompany(bookRecordUpdateLog.getNewRetCompanyId());
             int a = updateSelectiveByIdRe(vehicleBookRecord);
-            log.info("修改停靠分公司后预定记录： {}" + vehicleBookRecord.toString());
+            log.info(vehicleBookRecord.toString());
             if(a <= 0) {
                 return ObjectRestResponse.createDefaultFail();
             }
-            Vehicle vehicle = vehicleBiz.selectById(vehicleBookRecord.getVehicleId());
-            if (vehicle != null) {
-                vehicle.setParkBranchCompanyId(vehicleBookRecord.getRetCompany());
-                vehicleBiz.updateSelectiveByIdRe(vehicle);
+            //出行中才修改车辆停靠分公司
+            VehicleDepartureLogVo vehicleDepartureLogVo = vehicleDepartureService.getByRecordId(vehicleBookRecord.getId());
+            if (vehicleDepartureLogVo != null && vehicleDepartureLogVo.getState() == 0) {
+                Vehicle vehicle = vehicleBiz.selectById(vehicleBookRecord.getVehicleId());
+                if (vehicle != null) {
+                    vehicle.setParkBranchCompanyId(vehicleBookRecord.getRetCompany());
+                    vehicleBiz.updateSelectiveByIdRe(vehicle);
+                }
             }
             return bookRecordUpdateLogBiz.save(bookRecordUpdateLog);
         } else {

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

@@ -78,6 +78,9 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
     @Autowired
     BookRecordUpdateLogBiz bookRecordUpdateLogBiz;
 
+    @Autowired
+    VehicleDepartureService vehicleDepartureService;
+
 
     public UserFeign getUserFeign() {
         return userFeign;
@@ -335,10 +338,13 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
             bookRecordUpdateLog.setOperaterId(userDTO.getId());
             bookRecordUpdateLog.setOperaterName(userDTO.getName());
             bookRecordUpdateLog.setCreateTime(new Date());
-            Vehicle vehicle = vehicleBiz.selectById(oldValue.getVehicleId());
-            if (vehicle != null) {
-                vehicle.setParkBranchCompanyId(oldValue.getRetCompany());
-                vehicleBiz.updateSelectiveByIdRe(vehicle);
+            VehicleDepartureLogVo vehicleDepartureLogVo = vehicleDepartureService.getByRecordId(vehicleBookRecord.getId());
+            if (vehicleDepartureLogVo != null && vehicleDepartureLogVo.getState() == 0) {
+                Vehicle vehicle = vehicleBiz.selectById(vehicleBookRecord.getVehicleId());
+                if (vehicle != null) {
+                    vehicle.setParkBranchCompanyId(vehicleBookRecord.getRetCompany());
+                    vehicleBiz.updateSelectiveByIdRe(vehicle);
+                }
             }
             vehicleBookRecordBiz.updateSelectiveByIdRe(vehicleBookRecord);
             return bookRecordUpdateLogBiz.save(bookRecordUpdateLog);