Merge remote-tracking branch 'origin/dev' into dev

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

@@ -171,15 +171,13 @@ public class VehicleActiveService {
                 break;
         }
         List<VehicleBookRecordVo> vehicleBookRecordVos = vehicleBookRecordBiz.selectByVehicleId(vehicleId);
-        if(vehicleBookRecordVos != null && vehicleBookRecordVos.size() > 0) {
-            if(vehicleBookRecordVos.get(0).getVehicleDepartureLogVo() != null &&  vehicleBookRecordVos.get(0).getVehicleDepartureLogVo().getState() != 1) {
-                stringBuilder.append("中，使用人：");
-                stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUsername());
-                stringBuilder.append(" 使用人电话：");
-                stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUserPhone());
-            } else { //没有出车记录
-                stringBuilder.append(" 请联系管理员修改车辆状态为正常运行！");
-            }
+        if(vehicleBookRecordVos != null && vehicleBookRecordVos.size() > 0 && vehicleBookRecordVos.get(0).getVehicleDepartureLogVo() != null && vehicleBookRecordVos.get(0).getVehicleDepartureLogVo().getState() != 1) {
+            stringBuilder.append("中，使用人：");
+            stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUsername());
+            stringBuilder.append(" 使用人电话：");
+            stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUserPhone());
+        } else {
+            stringBuilder.append("请联系管理员修改车辆状态为正常状态");
         }
         return stringBuilder.toString();
     }

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

@@ -816,11 +816,14 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
                 break;
         }
         List<VehicleBookRecordVo> vehicleBookRecordVos = vehicleBookRecordBiz.selectByVehicleId(vehicleId);
-        if(vehicleBookRecordVos != null && vehicleBookRecordVos.size() > 0) {
+        vehicleBookRecordBiz.removeStatus2(vehicleBookRecordVos);
+        if(vehicleBookRecordVos != null && vehicleBookRecordVos.size() > 0 && vehicleBookRecordVos.get(0).getBookEndDate() != null && vehicleBookRecordVos.get(0).getBookEndDate().after(new Date())) {
             stringBuilder.append("中，使用人：");
             stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUsername());
             stringBuilder.append(" 使用人电话：");
             stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUserPhone());
+        } else {
+            stringBuilder.append("请联系管理员修改车辆状态为正常状态");
         }
         return stringBuilder.toString();
     }