From a36d93e531c292240dc59cb8e712b2eca21a4066 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 01 四月 2024 22:13:06 +0800
Subject: [PATCH] sync模块修复
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/report/utils/DateCycleUtil.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/report/utils/DateCycleUtil.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/report/utils/DateCycleUtil.java
index b1ab591..4dc33a8 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/report/utils/DateCycleUtil.java
+++ b/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 -> {
--
Gitblit v1.9.3