report模块修复

yangys

2024-03-29 e7aaa62a5c499747275a78ed6157024f15b9ab1e

 smart-man-boot/src/main/java/com/qianwen/smartman/modules/report/utils/DateCycleUtil.java

@@ -78,7 +78,7 @@
                });
                return list;
            case WEEK:
                List<IntervalDateDto> intervalDateDtoList = LocalDateTimeUtils.getIntervalDate(LocalDateTimeUtils.dateToLocalDate(org.springblade.core.tool.utils.DateUtil.parse(startTime, DateConstant.PATTERN_DATE)), LocalDateTimeUtils.dateToLocalDate(org.springblade.core.tool.utils.DateUtil.parse(endTime, DateConstant.PATTERN_DATE)));
                List<IntervalDateDto> intervalDateDtoList = LocalDateTimeUtils.getIntervalDate(LocalDateTimeUtils.dateToLocalDate(com.qianwen.core.tool.utils.DateUtil.parse(startTime, DateConstant.PATTERN_DATE)), LocalDateTimeUtils.dateToLocalDate(com.qianwen.core.tool.utils.DateUtil.parse(endTime, DateConstant.PATTERN_DATE)));
                List<String> result = new ArrayList<>();
                intervalDateDtoList.forEach(o -> {
                    o.getWeekList().forEach(week -> {
@@ -90,7 +90,7 @@
                });
                return result;
            case MONTH:
                List<IntervalDateDto> intervalDateDtoListM = LocalDateTimeUtils.getIntervalDate(LocalDateTimeUtils.dateToLocalDate(org.springblade.core.tool.utils.DateUtil.parse(startTime, DateConstant.PATTERN_DATE)), LocalDateTimeUtils.dateToLocalDate(org.springblade.core.tool.utils.DateUtil.parse(endTime, DateConstant.PATTERN_DATE)));
                List<IntervalDateDto> intervalDateDtoListM = LocalDateTimeUtils.getIntervalDate(LocalDateTimeUtils.dateToLocalDate(com.qianwen.core.tool.utils.DateUtil.parse(startTime, DateConstant.PATTERN_DATE)), LocalDateTimeUtils.dateToLocalDate(com.qianwen.core.tool.utils.DateUtil.parse(endTime, DateConstant.PATTERN_DATE)));
                List<String> resultM = new ArrayList<>();
                intervalDateDtoListM.forEach(o2 -> {
                    o2.getMonthList().forEach(month -> {