修改车辆还车公司同时修改车辆停靠分公司

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

@@ -83,6 +83,9 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
     @Autowired
     VehicleActiveService vehicleActiveService;
 
+    @Autowired
+    VehicleBiz vehicleBiz;
+
     @Override
     public UserFeign getUserFeign() {
         return userFeign;
@@ -248,10 +251,15 @@ 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);
+            }
             return bookRecordUpdateLogBiz.save(bookRecordUpdateLog);
         } else {
             return  ObjectRestResponse.createFailedResult(ResCode.VEHICLE_BOOK_RECORD_IS_NOT_EXIST.getCode(), ResCode.VEHICLE_BOOK_RECORD_IS_NOT_EXIST.getDesc());

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

@@ -335,6 +335,11 @@ 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);
+            }
             vehicleBookRecordBiz.updateSelectiveByIdRe(vehicleBookRecord);
             return bookRecordUpdateLogBiz.save(bookRecordUpdateLog);
         } else {