11692908/TMS-BOOT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并逻辑调整

Browse Source
This commit is contained in:
王帅 2025-04-27 14:50:19 +08:00
parent ae5c4a5759
commit c144976ec2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
View File

@ -164,7 +164,7 @@ mybatis-plus:
table-underline: true table-underline: true
configuration: configuration:
# 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
#log-impl: org.apache.ibatis.logging.stdout.StdOutImpl log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# 返回类型为Map,显示null对应的字段 # 返回类型为Map,显示null对应的字段
call-setters-on-nulls: true call-setters-on-nulls: true
#jeecg专用配置 #jeecg专用配置

6
jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/service/impl/DeliveryDemandServiceImpl.java
View File

@ -52,14 +52,14 @@ public class DeliveryDemandServiceImpl extends ServiceImpl<DeliveryDemandMapper,
} }
// 将需要合并的数据进行分组，以 shipType, pn, deliveryAddress, pickUpHub 为key // 将需要合并的数据进行分组，以 shipType, pn, deliveryAddress, pickUpHub 为key
Map<String, VehicleDemand> mergedMap = deliveryDemands.stream() Map<String, VehicleDemand> mergedMap = deliveryDemands.stream()
.collect(Collectors.groupingBy( .collect(Collectors.toMap(
demand -> String.format("%s|%s|%s|%s|%s", demand -> String.format("%s|%s|%s|%s|%s",
demand.getShipType(), demand.getShipType(),
demand.getPn(), demand.getPn(),
demand.getDeliveryAddress(), demand.getDeliveryAddress(),
demand.getPickUpHub(), demand.getPickUpHub(),
demand.getShipDate()), demand.getShipDate()),
Collectors.reducing(new VehicleDemand(), (demand) -> { demand -> {
VehicleDemand merged = new VehicleDemand(); VehicleDemand merged = new VehicleDemand();
merged.setShipType(demand.getShipType()); merged.setShipType(demand.getShipType());
merged.setPn(demand.getPn()); merged.setPn(demand.getPn());
@ -79,7 +79,7 @@ public class DeliveryDemandServiceImpl extends ServiceImpl<DeliveryDemandMapper,
(merged2.getTotalShips() == null ? 0 : merged2.getTotalShips()) (merged2.getTotalShips() == null ? 0 : merged2.getTotalShips())
); );
return merged1; return merged1;
}) }
)); ));
List<VehicleDemand> vehicleDemands = new ArrayList<>(); List<VehicleDemand> vehicleDemands = new ArrayList<>();
for (Map.Entry<String, VehicleDemand> entry : mergedMap.entrySet()) { for (Map.Entry<String, VehicleDemand> entry : mergedMap.entrySet()) {