修改提前还车逻辑

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

@@ -193,9 +193,22 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
         }
         vehicleBookRecordQueryVo.setCompanyIds(companyList);
         Query query = new Query(vehicleBookRecordQueryVo);
-        if (vehicleBookRecordQueryVo.getStatus() != null && vehicleBookRecordQueryVo.getStatus() == 2) {
+        if (vehicleBookRecordQueryVo.getStatus() != null && vehicleBookRecordQueryVo.getStatus() == 3) { //待出行
             List<VehicleBookRecordVo> list = mapper.getBookRecordInfo(query.getSuper());
-            removeStatus2(list);
+            removeStatus3(list);
+            PageInfo<VehicleBookRecordVo> vehicleBookRecordVoPageInfo = new PageInfo<>(list);
+            getupKeeps(vehicleBookRecordVoPageInfo.getList());
+            PageDataVO<VehicleBookRecordVo> vehicleBookRecordVoPageDataVO = PageDataVO.pageInfo(vehicleBookRecordVoPageInfo);
+            vehicleBookRecordVoPageDataVO.setPageNum(pageNo);
+            vehicleBookRecordVoPageDataVO.setPageSize(pageSize);
+            vehicleBookRecordVoPageDataVO.setTotalCount((long) vehicleBookRecordVoPageInfo.getList().size());
+            vehicleBookRecordVoPageDataVO.setTotalPage((vehicleBookRecordVoPageInfo.getList().size() + pageSize - 1) / pageSize);
+            vehicleBookRecordVoPageDataVO.setData(getData(vehicleBookRecordVoPageInfo.getList(), pageNo, pageSize));
+            return RestResponse.suc(vehicleBookRecordVoPageDataVO);
+        }
+        if (vehicleBookRecordQueryVo.getStatus() != null && vehicleBookRecordQueryVo.getStatus() == 5) { //出行中
+            List<VehicleBookRecordVo> list = mapper.getBookRecordInfo(query.getSuper());
+            removeStatus5(list);
             PageInfo<VehicleBookRecordVo> vehicleBookRecordVoPageInfo = new PageInfo<>(list);
             getupKeeps(vehicleBookRecordVoPageInfo.getList());
             PageDataVO<VehicleBookRecordVo> vehicleBookRecordVoPageDataVO = PageDataVO.pageInfo(vehicleBookRecordVoPageInfo);
@@ -211,13 +224,43 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
         return RestResponse.suc(pageDataVO);
     }
 
+    //筛选未出车的记录
     public void removeStatus2(List<VehicleBookRecordVo> list) {
         if (list != null && list.size() > 0) {
             Iterator<VehicleBookRecordVo> iterator = list.iterator();
             while (iterator.hasNext()) {
-                if (iterator.next().getVehicleDepartureLogVo() != null) {
+                VehicleBookRecordVo vehicleBookRecordVo = iterator.next();
+                if (vehicleBookRecordVo.getVehicleDepartureLogVo() != null) {
+                    iterator.remove();
+                }
+            }
+        }
+    }
+
+    //筛选未出车的记录
+    public void removeStatus3(List<VehicleBookRecordVo> list) {
+        if (list != null && list.size() > 0) {
+            Iterator<VehicleBookRecordVo> iterator = list.iterator();
+            while (iterator.hasNext()) {
+                VehicleBookRecordVo vehicleBookRecordVo = iterator.next();
+                if (vehicleBookRecordVo.getVehicleDepartureLogVo() != null) {
+                    iterator.remove();
+                }
+                vehicleBookRecordVo.setState(3);
+            }
+        }
+    }
+
+    //筛选已出车未还车记录
+    public void removeStatus5(List<VehicleBookRecordVo> list) {
+        if (list != null && list.size() > 0) {
+            Iterator<VehicleBookRecordVo> iterator = list.iterator();
+            while (iterator.hasNext()) {
+                VehicleBookRecordVo vehicleBookRecordVo = iterator.next();
+                if (vehicleBookRecordVo.getVehicleDepartureLogVo() == null || (vehicleBookRecordVo.getVehicleDepartureLogVo() != null && vehicleBookRecordVo.getVehicleDepartureLogVo().getState() ==1)) {
                     iterator.remove();
                 }
+                vehicleBookRecordVo.setState(5);
             }
         }
     }