From 29acd5877d2965542a1fc31ba19dfb561af738e3 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Wed, 18 Dec 2024 17:28:53 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E6=9C=8D=E5=8A=A1=E5=95=86?= =?UTF-8?q?=E6=88=90=E6=9C=AC=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 增加批量新增司机 --- .../receiver/report/DeliverFinishReportListener.java | 2 +- .../impl/DistributionAddvaluePackageServiceImpl.java | 9 ++++++++- 2 files changed, 9 insertions(+), 2 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 87d0e9bc4..91ef847a2 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 @@ -283,7 +283,7 @@ public class DeliverFinishReportListener implements ReportService { // 装卸费单价 String loadingUnloadingFee = expenseDispatchPriceCategoryVO.getLoadingUnloadingFee(); // 上楼层数 - // 查询出上楼层数 + // Integer stairsNumber = 0; if (addvaluePackageMap.containsKey(entity.getOrderPackageCode())) { stairsNumber = Convert.toInt(addvaluePackageMap.get(entity.getOrderPackageCode())); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAddvaluePackageServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAddvaluePackageServiceImpl.java index 26eb7e04b..1c33dfcdf 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAddvaluePackageServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAddvaluePackageServiceImpl.java @@ -28,6 +28,7 @@ import com.logpm.distribution.service.IDistributionAddvalueDetailService; import com.logpm.distribution.service.IDistributionAddvaluePackageService; import com.logpm.distribution.vo.DistributionAddvaluePackageVO; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.tool.utils.ObjectUtil; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -72,7 +73,13 @@ public class DistributionAddvaluePackageServiceImpl extends BaseServiceImpl map = list.stream().collect(Collectors.toMap(DistributionAddvaluePackageEntity::getAddvalueDetailId, DistributionAddvaluePackageEntity::getOrderPackageCode)); + Map map = list.stream() + .filter(it -> ObjectUtil.isNotEmpty(it.getAddvalueDetailId())) + .collect(Collectors.toMap( + DistributionAddvaluePackageEntity::getAddvalueDetailId, + DistributionAddvaluePackageEntity::getOrderPackageCode, + (existingValue, newValue) -> existingValue // 处理键冲突 + )); List list1 = addvalueDetailService.list( Wrappers.lambdaQuery() .select(DistributionAddvalueDetailEntity::getFloolNum, DistributionAddvalueDetailEntity::getId)