|
|
|
@ -217,15 +217,15 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
if(dis.getKind().equals("1")){ |
|
|
|
|
//z自
|
|
|
|
|
List<DistributionDeliverySelfEntity> list1 = distributionDeliverySelfService.list(Wrappers.<DistributionDeliverySelfEntity>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<DistributionDeliveryTripartiteEntity> list1 = distributionDeliveryTripartiteService.list(Wrappers.<DistributionDeliveryTripartiteEntity>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); |
|
|
|
|
} |
|
|
|
|