|
@@ -72,12 +72,12 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
|
|
|
nowDate = nowDate.withDayOfMonth(1);
|
|
|
Date currentMonth = Date.from(nowDate.atStartOfDay(DateUtil.zoneId).toInstant());
|
|
|
|
|
|
- LocalDate startDate = LocalDate.now();
|
|
|
+ LocalDate startDate = nowDate.plusDays(-30);
|
|
|
if(Objects.nonNull(queryInfo.getStartDate())){
|
|
|
startDate = LocalDateTime.ofInstant(queryInfo.getStartDate().toInstant(), DateUtil.zoneId).toLocalDate();
|
|
|
}
|
|
|
|
|
|
- LocalDate endDate = startDate.withMonth(12);
|
|
|
+ LocalDate endDate = nowDate.plusDays(-1);
|
|
|
if(Objects.nonNull(queryInfo.getEndDate())){
|
|
|
endDate = LocalDateTime.ofInstant(queryInfo.getEndDate().toInstant(), DateUtil.zoneId).toLocalDate();
|
|
|
}
|
|
@@ -148,7 +148,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
|
|
|
}
|
|
|
|
|
|
if(StringUtils.isBlank(dayStr)){
|
|
|
- dayStr = nowDate.toString();
|
|
|
+ dayStr = nowDate.plusDays(-1).toString();
|
|
|
}
|
|
|
|
|
|
//运营数据
|