Browse Source

dhl

pull/1/head
donghaolin 4 months ago
parent
commit
0518e95bb5
  1. 3
      src/main/java/com/example/demo/domain/vo/SumCoin.java
  2. 3
      src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java

3
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;
}

3
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<SumCoin> queryResult = null;
// 如果天数差大于100天
if (daysBetween > 100) {
if (year.equals(1)) {
if (1 == updateType) {
return statisticsMapper.getMediuConsumeCoin(searchStartTime, searchEndTime);
} else if (0 == updateType) {

Loading…
Cancel
Save