123

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

@@ -79,7 +79,7 @@ public class VehicleActiveService {
             throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc(),
                     ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode());
         }
-        if(MileageLift==null||MileageLift1 >= MileageLift){
+        if(MileageLift == null || MileageLift1 >= MileageLift){
             // 写入车辆公里数,预计目的地
             vehicle.setMileageLastUpdate(MileageLift1);
             vehicle.setExpectDestinationBranchCompanyId(departureVo.getExpectArrivalBranchCompanyId());
@@ -311,7 +311,8 @@ public class VehicleActiveService {
                 if(list != null && list.size() > 0) {
                     Iterator<VehicleBookRecordVo> iterator = list.iterator();
                     while (iterator.hasNext()) {
-                        if(iterator.next().getVehicleDepartureLogVo() == null && iterator.next().getBookEndDate().after(new Date())) {
+                        VehicleBookRecordVo vehicleBookRecordVo = iterator.next();
+                        if(vehicleBookRecordVo.getVehicleDepartureLogVo() == null && vehicleBookRecordVo.getBookEndDate().after(new Date())) {
                             iterator.remove();
                         }
                     }