|
@@ -2167,12 +2167,13 @@ public class WaybillOrderService {
|
|
|
* 将扁平的运单列表转换为“汇总行在前,明细在后”的报表格式
|
|
* 将扁平的运单列表转换为“汇总行在前,明细在后”的报表格式
|
|
|
*/
|
|
*/
|
|
|
public List<WaybillOrderReportResp> filter(WaybillOrderReportQueryParam param, List<WaybillOrderReportResp> orderRepoost) {
|
|
public List<WaybillOrderReportResp> filter(WaybillOrderReportQueryParam param, List<WaybillOrderReportResp> orderRepoost) {
|
|
|
|
|
+ log.info("[报表]开始每日报表模糊查询,size:{}", orderRepoost.size());
|
|
|
if (orderRepoost == null || orderRepoost.isEmpty()) {
|
|
if (orderRepoost == null || orderRepoost.isEmpty()) {
|
|
|
return Collections.emptyList();
|
|
return Collections.emptyList();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
//过滤
|
|
//过滤
|
|
|
- return orderRepoost.stream().filter(
|
|
|
|
|
|
|
+ List<WaybillOrderReportResp> reportResps = orderRepoost.stream().filter(
|
|
|
report -> {
|
|
report -> {
|
|
|
// 条件1:客户ID过滤
|
|
// 条件1:客户ID过滤
|
|
|
boolean customerMatch = true;
|
|
boolean customerMatch = true;
|
|
@@ -2180,7 +2181,7 @@ public class WaybillOrderService {
|
|
|
customerMatch = param.getCustomerEntIds().contains(report.getProcurementEntId());
|
|
customerMatch = param.getCustomerEntIds().contains(report.getProcurementEntId());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- // 条件2:商品ID过滤(如果传了才过滤)
|
|
|
|
|
|
|
+ // 条件2:商品ID过滤
|
|
|
boolean goodsMatch = true;
|
|
boolean goodsMatch = true;
|
|
|
if (CollectionUtils.isNotEmpty(param.getDictIds())) {
|
|
if (CollectionUtils.isNotEmpty(param.getDictIds())) {
|
|
|
goodsMatch = param.getDictIds().contains(report.getDictId());
|
|
goodsMatch = param.getDictIds().contains(report.getDictId());
|
|
@@ -2189,6 +2190,9 @@ public class WaybillOrderService {
|
|
|
return customerMatch && goodsMatch;
|
|
return customerMatch && goodsMatch;
|
|
|
|
|
|
|
|
}).collect(Collectors.toList());
|
|
}).collect(Collectors.toList());
|
|
|
|
|
+
|
|
|
|
|
+ log.info("[报表]每日报表模糊查询结束,size:{}", reportResps.size());
|
|
|
|
|
+ return reportResps;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|