From 0518e95bb5d6d216021b1b0323e81c90595f0550 Mon Sep 17 00:00:00 2001 From: donghaolin <17667510818@163.com> Date: Tue, 14 Jan 2025 13:23:58 +0800 Subject: [PATCH] dhl --- src/main/java/com/example/demo/domain/vo/SumCoin.java | 3 +++ src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/example/demo/domain/vo/SumCoin.java b/src/main/java/com/example/demo/domain/vo/SumCoin.java index 592c6f4..96ca3dc 100644 --- a/src/main/java/com/example/demo/domain/vo/SumCoin.java +++ b/src/main/java/com/example/demo/domain/vo/SumCoin.java @@ -89,4 +89,7 @@ public class SumCoin { private BigDecimal totalTask; private String token; +// 识别年 + private Integer year; + } diff --git a/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java index a6f2c4d..94170d7 100644 --- a/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java @@ -428,6 +428,7 @@ public class StatisticsServiceImpl implements StatisticsService { Date searchStartTime = sumcoin.getSearchStartTime(); Date searchEndTime = sumcoin.getSearchEndTime(); + Integer year = sumcoin.getYear(); Integer updateType = sumcoin.getUpdateType(); // 如果开始时间和结束时间都为空,则直接返回默认统计结果,即全查 @@ -470,7 +471,7 @@ public class StatisticsServiceImpl implements StatisticsService { List queryResult = null; // 如果天数差大于100天 - if (daysBetween > 100) { + if (year.equals(1)) { if (1 == updateType) { return statisticsMapper.getMediuConsumeCoin(searchStartTime, searchEndTime); } else if (0 == updateType) {