diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/service/ShouJuStatisticsService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/service/ShouJuStatisticsService.java index 1395b43..d27ad29 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/service/ShouJuStatisticsService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/service/ShouJuStatisticsService.java @@ -197,6 +197,12 @@ public class ShouJuStatisticsService implements StatisticsService { log.error("订单动态数据获取失败", ex); return 0D; }); + CompletableFuture total_disposeWeight = CompletableFuture.supplyAsync(() -> { + return statisticsMapper.disposeWeight(null, null); + }).exceptionally(ex -> { + log.error("订单动态数据获取失败", ex); + return 0D; + }); CompletableFuture yesterday_disposeWeight = CompletableFuture.supplyAsync(() -> { DateTime yesterday = DateUtil.offsetDay(date, -1); long yesterday_start = DateUtil.beginOfDay(yesterday).getTime() / 1000; @@ -388,6 +394,7 @@ public class ShouJuStatisticsService implements StatisticsService { .put("yearAmountIn", yearAmount_.get_0()) .put("yearAmountOut", yearAmount_.get_1()) .put("chuzhi", map2) + .put("totaDisposeWeight", total_disposeWeight.get()) .build(); } diff --git a/njzscloud-svr/src/main/resources/mapper/ShouJuStatisticsMapper.xml b/njzscloud-svr/src/main/resources/mapper/ShouJuStatisticsMapper.xml index 518f15c..a24fe01 100644 --- a/njzscloud-svr/src/main/resources/mapper/ShouJuStatisticsMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/ShouJuStatisticsMapper.xml @@ -130,12 +130,17 @@