|
|
@@ -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);
|
|
|
}
|
|
|
|
|
|
/**
|