Merge branch 'master-arrival-bug'

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 {

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

@@ -986,8 +986,12 @@
         from
         <!--
             查询开始时间 前面的最后一条 预约记录
-            查询结束时间 后面的第一条 预约记录 -->
-        (select vehicle_id, max(if(book_end_date &lt; #{startDateExtend}, book_end_date, null)) as max_book_end_date, min(if(book_start_date &gt; #{endDateExtend}, book_start_date, null)) as min_book_start_date from vehicle_book_record where status != 4 and status != 6 group by vehicle_id) sevbr
+            查询结束时间 后面的第一条 预约记录
+            添加比较actual_start_date 和 actual_end_date-->
+        (select vehicle_id
+            , max(if(IFNULL(actual_end_date, book_end_date) &lt; #{startDateExtend}, IFNULL(actual_end_date,book_end_date), null)) as max_book_end_date
+            , min(if(IFNULL(actual_start_date, book_start_date) &gt; #{endDateExtend}, IFNULL(actual_start_date, book_start_date), null)) as min_book_start_date
+        from vehicle_book_record where status != 4 and status != 6 group by vehicle_id) sevbr
         left join vehicle_book_record vbre
         on sevbr.vehicle_id = vbre.vehicle_id and sevbr.max_book_end_date = vbre.book_end_date and vbre.status != 4 and vbre.status != 6
         left join vehicle_book_record vbrs