From 031f7974e0895a9b0417be36b6d1d9e6464c3c4b Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Fri, 10 Nov 2023 01:39:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=AC=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionDeliveryListServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 890d86773..3ed9fac91 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -217,15 +217,15 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl list1 = distributionDeliverySelfService.list(Wrappers.query().lambda().eq(DistributionDeliverySelfEntity::getDeliveryId, dis.getId())); - String collect = list1.stream().map(DistributionDeliverySelfEntity::getDriverName).collect(Collectors.joining()); - String colle = list1.stream().map(DistributionDeliverySelfEntity::getVehicleNub).collect(Collectors.joining()); + String collect = list1.stream().map(DistributionDeliverySelfEntity::getDriverName).collect(Collectors.joining(",")); + String colle = list1.stream().map(DistributionDeliverySelfEntity::getVehicleNub).collect(Collectors.joining(",")); deliveryListExcel.setDriver(collect); deliveryListExcel.setVehicle(colle); }else{ //三 List list1 = distributionDeliveryTripartiteService.list(Wrappers.query().lambda().eq(DistributionDeliveryTripartiteEntity::getDeliveryId, dis.getId())); - String collect = list1.stream().map(DistributionDeliveryTripartiteEntity::getDriverName).collect(Collectors.joining()); - String colle = list1.stream().map(DistributionDeliveryTripartiteEntity::getVehicleNum).collect(Collectors.joining()); + String collect = list1.stream().map(DistributionDeliveryTripartiteEntity::getDriverName).collect(Collectors.joining(",")); + String colle = list1.stream().map(DistributionDeliveryTripartiteEntity::getVehicleNum).collect(Collectors.joining(",")); deliveryListExcel.setDriver(collect); deliveryListExcel.setVehicle(colle); }