diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml index b25f21d..7cb7eeb 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml +++ b/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专用配置 diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/service/impl/DeliveryDemandServiceImpl.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/service/impl/DeliveryDemandServiceImpl.java index 815b04b..d8161dc 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/service/impl/DeliveryDemandServiceImpl.java +++ b/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 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 vehicleDemands = new ArrayList<>(); for (Map.Entry entry : mergedMap.entrySet()) {