取消预定和出车的bug

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

@@ -179,11 +179,15 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
         if (vehicleBookRecordQueryVo.getStatus() != null && vehicleBookRecordQueryVo.getStatus() == 2) {
             List<VehicleBookRecordVo> list = mapper.getBookRecordInfo(query.getSuper());
             removeStatus2(list);
-            //PageHelper.startPage(vehicleBookRecordQueryVo.getPage().intValue(), vehicleBookRecordQueryVo.getLimit().intValue());
             PageInfo<VehicleBookRecordVo> vehicleBookRecordVoPageInfo = new PageInfo<>(list);
             getupKeeps(vehicleBookRecordVoPageInfo.getList());
-            vehicleBookRecordVoPageInfo.setList(getData(vehicleBookRecordVoPageInfo.getList(), pageNo, pageSize));
-            return RestResponse.suc(getVehicleBookRecordVoPageInfo(PageDataVO.pageInfo(vehicleBookRecordVoPageInfo), pageNo, pageSize));
+            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);
         }
         PageDataVO<VehicleBookRecordVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getBookRecordInfo(query.getSuper()));
         getupKeeps(pageDataVO.getData());
@@ -554,15 +558,4 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
         }
         return data.subList(fromIndex, toIndex);
     }
-
-    public PageDataVO<VehicleBookRecordVo> getVehicleBookRecordVoPageInfo(PageDataVO<VehicleBookRecordVo> vehicleBookRecordVoPageInfo, Integer currentPage, Integer pageSize) {
-        if (vehicleBookRecordVoPageInfo.getData() == null) {
-            return vehicleBookRecordVoPageInfo;
-        }
-        vehicleBookRecordVoPageInfo.setPageNum(currentPage);
-        vehicleBookRecordVoPageInfo.setPageSize(pageSize);
-        vehicleBookRecordVoPageInfo.setTotalCount((long)vehicleBookRecordVoPageInfo.getData().size());
-        vehicleBookRecordVoPageInfo.setTotalPage((vehicleBookRecordVoPageInfo.getData().size() + pageSize - 1) / pageSize);
-        return vehicleBookRecordVoPageInfo;
-    }
 }