Ver Fonte

修改分页总条数

donglang há 6 meses atrás
pai
commit
f52ee4f6d4

+ 1 - 1
sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfAutoDispatchService.java

@@ -444,7 +444,7 @@ public class KwfAutoDispatchService {
         }
         List<KwfDriverConductRulesLogVO> rulesLogVOS = records.stream().map(KwfDriverConductRulesLogVO::toVO).collect(Collectors.toList());
         log.info("查询司机行为规则日志成功!");
-        return PageDataResult.success(request.getPageNum(), request.getPageSize(), (long) rulesLogVOS.size(), rulesLogVOS);
+        return PageDataResult.success(request.getPageNum(), request.getPageSize(), driverConductRulesLog.getTotal(), rulesLogVOS);
     }
 
 }

+ 2 - 2
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/app/WaybillOrderService.java

@@ -307,7 +307,7 @@ public class WaybillOrderService {
                             tradeIdAndLogOrderList,logOrderIdAndSubtaskMap,dictValueAndDictResDtoMap);
                 }).collect(Collectors.toList());
         log.info("查询司机关联车辆的物流订单成功!");
-        return PageDataResult.success(param.getPageNum(), param.getPageSize(), (long) ordderList.size(), ordderList);
+        return PageDataResult.success(param.getPageNum(), param.getPageSize(), logOrderCirculateList.getTotal(), ordderList);
     }
 
     /**
@@ -429,7 +429,7 @@ public class WaybillOrderService {
         //获取运单关联数据并返回结果
         List<WaybillOrderStatusResp> ordderList = getWaybillOrderRelevantData(param, records);
         log.info("查询司机的物流运单成功!");
-        return PageDataResult.success(param.getPageNum(), param.getPageSize(), (long) ordderList.size(), ordderList);
+        return PageDataResult.success(param.getPageNum(), param.getPageSize(), waybillOrderList.getTotal() , ordderList);
     }
 
     /**