修改提前还车逻辑

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

@@ -322,7 +322,7 @@ public class VehicleActiveService {
                     while (iterator.hasNext()) {
                         VehicleBookRecordVo vehicleBookRecordVo = iterator.next();
                         //未出车且超过出车时间和已出车的和本条记录过滤，剩下为正常未出车记录
-                        if ((vehicleBookRecordVo.getVehicleDepartureLogVo() == null && vehicleBookRecordVo.getBookEndDate().getTime() - new Date().getTime() < 0) || (vehicleBookRecordVo.getVehicleDepartureLogVo() != null) || (arrivalVo.getBookRecordId() == vehicleBookRecord.getId())) {
+                        if ((arrivalVo.getBookRecordId() == vehicleBookRecordVo.getId()) || (vehicleBookRecordVo.getVehicleDepartureLogVo() == null && vehicleBookRecordVo.getBookEndDate().getTime() - new Date().getTime() < 0) || (vehicleBookRecordVo.getVehicleDepartureLogVo() != null)) {
                             iterator.remove();
                         }
                     }