From 75f9894ebac12b13c7ead27c3e16db833ee9251a Mon Sep 17 00:00:00 2001
From: z1415143022 <z1415143022@163.com>
Date: 星期二, 25 三月 2025 20:02:45 +0800
Subject: [PATCH] Merge branch 'develop1.0' into zhangjw_from_develop1.0

---
 zhitan-common/src/main/java/com/zhitan/common/utils/DateTimeUtil.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/zhitan-common/src/main/java/com/zhitan/common/utils/DateTimeUtil.java b/zhitan-common/src/main/java/com/zhitan/common/utils/DateTimeUtil.java
index c359f6a..3299e26 100644
--- a/zhitan-common/src/main/java/com/zhitan/common/utils/DateTimeUtil.java
+++ b/zhitan-common/src/main/java/com/zhitan/common/utils/DateTimeUtil.java
@@ -803,10 +803,10 @@
     public static List<TypeTime> getDateTimeList(String timeType, Date dataTime) {
 
         List<TypeTime> resultList = new ArrayList<>();
-
-        Date beginTime = DateUtil.beginOfDay(dataTime);
+        Date beginTime;
         switch (timeType) {
             case TimeTypeConst.TIME_TYPE_HOUR:
+                beginTime = DateUtil.beginOfDay(dataTime);
                 for (int i = 1; i <= 24; i++) {
                     TypeTime typeTime = new TypeTime();
                     typeTime.setDataTime(DateUtil.format(beginTime, COMMON_PATTERN));
@@ -818,6 +818,7 @@
                 }
                 break;
             case TimeTypeConst.TIME_TYPE_DAY:
+                beginTime = DateUtil.beginOfMonth(dataTime);
                 for (int i = 1; i <= 31; i++) {
                     TypeTime typeTime = new TypeTime();
                     typeTime.setDataTime(DateUtil.format(beginTime, COMMON_PATTERN));
@@ -829,6 +830,7 @@
                 }
                 break;
             case TimeTypeConst.TIME_TYPE_MONTH:
+                beginTime = DateUtil.beginOfYear(dataTime);
                 for (int i = 1; i <= 12; i++) {
                     TypeTime typeTime = new TypeTime();
                     typeTime.setDataTime(DateUtil.format(beginTime, COMMON_PATTERN));

--
Gitblit v1.9.3