修改提前还车逻辑

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

@@ -192,9 +192,9 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
             }
         }
         vehicleBookRecordQueryVo.setCompanyIds(companyList);
-        Query query = new Query(vehicleBookRecordQueryVo);
         if (vehicleBookRecordQueryVo.getStatus() != null && vehicleBookRecordQueryVo.getStatus() == 3) { //待出行
             vehicleBookRecordQueryVo.setStatus(null);
+            Query query = new Query(vehicleBookRecordQueryVo);
             List<VehicleBookRecordVo> list = mapper.getBookRecordInfo(query.getSuper());
             removeStatus3(list);
             PageInfo<VehicleBookRecordVo> vehicleBookRecordVoPageInfo = new PageInfo<>(list);
@@ -209,6 +209,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
         }
         if (vehicleBookRecordQueryVo.getStatus() != null && vehicleBookRecordQueryVo.getStatus() == 5) { //出行中
             vehicleBookRecordQueryVo.setStatus(null);
+            Query query = new Query(vehicleBookRecordQueryVo);
             List<VehicleBookRecordVo> list = mapper.getBookRecordInfo(query.getSuper());
             removeStatus5(list);
             PageInfo<VehicleBookRecordVo> vehicleBookRecordVoPageInfo = new PageInfo<>(list);
@@ -223,6 +224,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
         }
         if (vehicleBookRecordQueryVo.getStatus() != null && vehicleBookRecordQueryVo.getStatus() == 7) { //出行中
             vehicleBookRecordQueryVo.setStatus(null);
+            Query query =  new Query(vehicleBookRecordQueryVo);
             List<VehicleBookRecordVo> list = mapper.getBookRecordInfo(query.getSuper());
             removeStatus7(list);
             PageInfo<VehicleBookRecordVo> vehicleBookRecordVoPageInfo = new PageInfo<>(list);
@@ -235,6 +237,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
             vehicleBookRecordVoPageDataVO.setData(getData(vehicleBookRecordVoPageInfo.getList(), pageNo, pageSize));
             return RestResponse.suc(vehicleBookRecordVoPageDataVO);
         }
+        Query query =  new Query(vehicleBookRecordQueryVo);
         PageDataVO<VehicleBookRecordVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getBookRecordInfo(query.getSuper()));
         getupKeeps(pageDataVO.getData());
         return RestResponse.suc(pageDataVO);