合并逻辑调整

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

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

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

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