From 7baed9209086324dba79d14407579b52628616c8 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期三, 25 十月 2023 11:36:01 +0800
Subject: [PATCH] 34~58PwrdevHistorydataGwController.java;30行
---
src/main/java/com/whyc/util/DateUtil.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/util/DateUtil.java b/src/main/java/com/whyc/util/DateUtil.java
index 9279411..abb7f65 100644
--- a/src/main/java/com/whyc/util/DateUtil.java
+++ b/src/main/java/com/whyc/util/DateUtil.java
@@ -165,7 +165,8 @@
startTimeCalendar.setTime(startTime);
Calendar endTimeCalendar = Calendar.getInstance();
- Date endTime = DateUtil.YYYY_MM_DD_HH_MM_SS.parse(endTimeStr);
+ //Date endTime = DateUtil.YYYY_MM_DD_HH_MM_SS.parse(endTimeStr);
+ Date endTime = ThreadLocalUtil.parse(endTimeStr,1);
endTimeCalendar.setTime(endTime);
/*String[] startTimeSplit = startTimeStr.split("-");
@@ -583,6 +584,7 @@
existDefaultYear = true;
yearTimeMap.remove(DateUtil.YYYY_MM_TABLE.format(endTimeDate));
+ yearTimeMap.remove(ThreadLocalUtil.format(endTimeDate,2));
}
//璋冩暣涓嬮『搴�,灏哾efault璋冩暣鍒伴浣�
if(existDefaultYear){
--
Gitblit v1.9.1