|
|
@@ -68,7 +68,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
|
|
|
List<IndexBaseDto> result = new ArrayList<>();
|
|
|
|
|
|
LocalDate nowDate = LocalDate.now();
|
|
|
- Date currentMonth = Date.from(nowDate.atStartOfDay(DateUtil.zoneId).toInstant());
|
|
|
+// Date currentMonth = Date.from(nowDate.atStartOfDay(DateUtil.zoneId).toInstant());
|
|
|
|
|
|
LocalDate startDate = nowDate.plusDays(-30);
|
|
|
if(Objects.nonNull(queryInfo.getStartDate())){
|
|
|
@@ -79,6 +79,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
|
|
|
if(Objects.nonNull(queryInfo.getEndDate())){
|
|
|
endDate = LocalDateTime.ofInstant(queryInfo.getEndDate().toInstant(), DateUtil.zoneId).toLocalDate();
|
|
|
}
|
|
|
+ Date currentMonth = Date.from(endDate.atStartOfDay(DateUtil.zoneId).toInstant());
|
|
|
|
|
|
Set<Integer> organIds = null;
|
|
|
if(StringUtils.isNotBlank(queryInfo.getOrganId())){
|
