Commit 5982971c authored by jiaorz's avatar jiaorz

修改提前还车逻辑

parent d5866945
...@@ -322,7 +322,7 @@ public class VehicleActiveService { ...@@ -322,7 +322,7 @@ public class VehicleActiveService {
while (iterator.hasNext()) { while (iterator.hasNext()) {
VehicleBookRecordVo vehicleBookRecordVo = iterator.next(); VehicleBookRecordVo vehicleBookRecordVo = iterator.next();
//未出车且超过出车时间和已出车的和本条记录过滤,剩下为正常未出车记录 //未出车且超过出车时间和已出车的和本条记录过滤,剩下为正常未出车记录
if ((arrivalVo.getBookRecordId() == vehicleBookRecord.getId()) || (vehicleBookRecordVo.getVehicleDepartureLogVo() == null && vehicleBookRecordVo.getBookEndDate().getTime() - new Date().getTime() < 0) || (vehicleBookRecordVo.getVehicleDepartureLogVo() != null)) { if ((arrivalVo.getBookRecordId() == vehicleBookRecordVo.getId()) || (vehicleBookRecordVo.getVehicleDepartureLogVo() == null && vehicleBookRecordVo.getBookEndDate().getTime() - new Date().getTime() < 0) || (vehicleBookRecordVo.getVehicleDepartureLogVo() != null)) {
iterator.remove(); iterator.remove();
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment