|
|
@@ -146,16 +146,31 @@ public class KwpSettlementLogisticsService {
|
|
|
settlementReq.setEntId(LoginUserHolder.getEntId());
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 分页查询结算物流(运费)相关订单数据,并查询出对应合计
|
|
|
+ *
|
|
|
+ * @author Aick Spt
|
|
|
+ * @date 2023-08-03 10:29
|
|
|
+ */
|
|
|
private PageMoreRes<SettlementLogisticsDto> pageSelect(SettlementReq settlementReq) {
|
|
|
+ //验证相关参数
|
|
|
validSettlementReq(settlementReq);
|
|
|
+ //添加默认分页数据
|
|
|
PageHelper.startPage(settlementReq.getPage(), settlementReq.getPageSize());
|
|
|
+ //查询分页数据
|
|
|
List<SettlementLogisticsDto> kwpLedgerLogisticsList = settlementLogisticsMapper.pageSelect(settlementReq);
|
|
|
+ //查询同样条件下的合计
|
|
|
SettlementLogisticsSumVo settlementLogisticsSum = settlementLogisticsMapper.selectSum(settlementReq);
|
|
|
|
|
|
- // 对查询结果进行处理,转换 status 到 desc
|
|
|
+ // 对查询结果进行处理,转换 status 等状态值为对应中文描述
|
|
|
return new PageMoreRes<>(getSettlementLogisticsDtoPageRes(kwpLedgerLogisticsList), settlementLogisticsSum);
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 对查询结果进行处理,转换 status 等状态值为对应中文描述
|
|
|
+ * @author Aick Spt
|
|
|
+ * @date 2023-08-03 10:44
|
|
|
+ */
|
|
|
private PageInfo<SettlementLogisticsDto> getSettlementLogisticsDtoPageRes(List<SettlementLogisticsDto> kwpLedgerLogisticsList) {
|
|
|
for (SettlementLogisticsDto entity : kwpLedgerLogisticsList) {
|
|
|
setDetailDesc(entity);
|
|
|
@@ -163,6 +178,11 @@ public class KwpSettlementLogisticsService {
|
|
|
return new PageInfo<>(kwpLedgerLogisticsList);
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 根据条件获取列表头部汇总数据
|
|
|
+ * @author Aick Spt
|
|
|
+ * @date 2023-08-03 10:44
|
|
|
+ */
|
|
|
public List<TableTop> getCountList(SettlementReq settlementReq) {
|
|
|
validSettlementReq(settlementReq);
|
|
|
SettlementLogisticsStatusCountVo settlementLogisticsStatusCountVos = new SettlementLogisticsStatusCountVo();
|