From f5eda3d0a16c0a353e4ec59ab3761663ff3f3144 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Thu, 27 Mar 2025 15:53:12 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E9=85=8D=E9=80=81=E6=88=90?= =?UTF-8?q?=E6=9C=AC=E4=BB=B7=E6=A0=BC=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 修改代码错误问题 --- .../receiver/report/DeliverFinishReportListener.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java index ba463406a..42749876e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java @@ -160,6 +160,9 @@ public class DeliverFinishReportListener implements ReportService { entity.setWaybillNumber(qualityDeliverEntity.getWaybillNumber()); entity.setConditions(qualityDeliverEntity.getConditions()); entity.setSignNum(qualityDeliverEntity.getSignNum()); + entity.setArriveProvince(qualityDeliverEntity.getArriveProvince()); + entity.setArriveCity(qualityDeliverEntity.getArriveCity()); + entity.setArriveDistrict(qualityDeliverEntity.getArriveDistrict()); // 查询品类 BasicdataFactoryCategoryEntity param = new BasicdataFactoryCategoryEntity(); param.setBrand(qualityDeliverEntity.getBrandName()); @@ -770,9 +773,11 @@ public class DeliverFinishReportListener implements ReportService { Collection values = valueMap.values(); // 按省市区分组后的数量 arriveProvince arriveCity arriveDistrict if(CollUtil.isNotEmpty(values)){ - Set collect1 = values.stream().map(v -> { - return v.getArriveProvince() + v.getArriveCity() + v.getArriveDistrict(); - }).collect(Collectors.toSet()); + Set collect1 = values.stream() + .filter(v -> StrUtil.isNotEmpty(v.getArriveProvince() + v.getArriveCity() + v.getArriveDistrict())) + .map(v -> { + return v.getArriveProvince() + v.getArriveCity() + v.getArriveDistrict(); + }).collect(Collectors.toSet()); if(CollUtil.isNotEmpty(collect1)){ dkp = collect1.size(); }