修改提前还车逻辑

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

@@ -193,7 +193,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
         }
         vehicleBookRecordQueryVo.setCompanyIds(companyList);
         if (vehicleBookRecordQueryVo.getStatus() != null && vehicleBookRecordQueryVo.getStatus() == 3) { //待出行
-            vehicleBookRecordQueryVo.setStatus(null);
+            vehicleBookRecordQueryVo.setStatus(2);
             Query query = new Query(vehicleBookRecordQueryVo);
             List<VehicleBookRecordVo> list = mapper.getBookRecordInfo(query.getSuper());
             removeStatus3(list);
@@ -208,7 +208,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
             return RestResponse.suc(vehicleBookRecordVoPageDataVO);
         }
         if (vehicleBookRecordQueryVo.getStatus() != null && vehicleBookRecordQueryVo.getStatus() == 5) { //出行中
-            vehicleBookRecordQueryVo.setStatus(null);
+            vehicleBookRecordQueryVo.setStatus(2);
             Query query = new Query(vehicleBookRecordQueryVo);
             List<VehicleBookRecordVo> list = mapper.getBookRecordInfo(query.getSuper());
             removeStatus5(list);
@@ -222,8 +222,8 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
             vehicleBookRecordVoPageDataVO.setData(getData(vehicleBookRecordVoPageInfo.getList(), pageNo, pageSize));
             return RestResponse.suc(vehicleBookRecordVoPageDataVO);
         }
-        if (vehicleBookRecordQueryVo.getStatus() != null && vehicleBookRecordQueryVo.getStatus() == 7) { //出行中
-            vehicleBookRecordQueryVo.setStatus(null);
+        if (vehicleBookRecordQueryVo.getStatus() != null && vehicleBookRecordQueryVo.getStatus() == 7) { //已完成
+            vehicleBookRecordQueryVo.setStatus(2);
             Query query =  new Query(vehicleBookRecordQueryVo);
             List<VehicleBookRecordVo> list = mapper.getBookRecordInfo(query.getSuper());
             removeStatus7(list);