Merge branch 'master-arrival-bug' into dev

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

@@ -236,6 +236,8 @@ public class VehicleActiveService {
             if (flag) { //如果此条记录后面还有未收车记录，就不修改车辆状态
                 vehicle.setStatus(VehicleStatus.NORMAL.getCode());
             }
+            //2019-11-22 16:30 还原还车时修改车辆停靠分公司需求
+            vehicle.setParkBranchCompanyId(vehicleBookRecord.getRetCompany());
             vehicleMapper.updateByPrimaryKeySelective(vehicle);
 
             DateTime arrivalDate = new DateTime(vehicleBookRecord.getBookEndDate());

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

@@ -256,14 +256,15 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
                 return ObjectRestResponse.createDefaultFail();
             }
             //出行中才修改车辆停靠分公司
-            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);
-                }
-            }
+            //2019-11-22 16:30 取消修改还车地点同时修改停靠分公司需求
+//            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 {
             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

@@ -338,14 +338,15 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
             bookRecordUpdateLog.setOperaterId(userDTO.getId());
             bookRecordUpdateLog.setOperaterName(userDTO.getName());
             bookRecordUpdateLog.setCreateTime(new Date());
-            VehicleDepartureLogVo vehicleDepartureLogVo = vehicleDepartureService.getByRecordId(oldValue.getId());
-            if (vehicleDepartureLogVo != null && vehicleDepartureLogVo.getState() == 0) {
-                Vehicle vehicle = vehicleBiz.selectById(oldValue.getVehicleId());
-                if (vehicle != null) {
-                    vehicle.setParkBranchCompanyId(oldValue.getRetCompany());
-                    vehicleBiz.updateSelectiveByIdRe(vehicle);
-                }
-            }
+            //2019-11-22 16:30 取消修改还车地点同时修改停靠分公司需求
+//            VehicleDepartureLogVo vehicleDepartureLogVo = vehicleDepartureService.getByRecordId(oldValue.getId());
+//            if (vehicleDepartureLogVo != null && vehicleDepartureLogVo.getState() == 0) {
+//                Vehicle vehicle = vehicleBiz.selectById(oldValue.getVehicleId());
+//                if (vehicle != null) {
+//                    vehicle.setParkBranchCompanyId(oldValue.getRetCompany());
+//                    vehicleBiz.updateSelectiveByIdRe(vehicle);
+//                }
+//            }
             vehicleBookRecordBiz.updateSelectiveByIdRe(vehicleBookRecord);
             return bookRecordUpdateLogBiz.save(bookRecordUpdateLog);
         } else {