From a240bf0d15a2bb8a40ffe0b0e3c1b6efbed5b6d5 Mon Sep 17 00:00:00 2001
From: VVT789 <sdxt_0802@163.com>
Date: 星期六, 22 三月 2025 19:46:52 +0800
Subject: [PATCH] 修复已知问题，删除指标时增加判断
---
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