From 5f8cc6faf05f99263b4bf80195e571baf6c48fda Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期五, 07 七月 2023 17:29:25 +0800
Subject: [PATCH] 数据查询问题修复
---
src/main/java/com/whyc/util/DateUtil.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/util/DateUtil.java b/src/main/java/com/whyc/util/DateUtil.java
index e530933..e125050 100644
--- a/src/main/java/com/whyc/util/DateUtil.java
+++ b/src/main/java/com/whyc/util/DateUtil.java
@@ -366,7 +366,7 @@
Calendar startTime = Calendar.getInstance();
startTime.setTime(startTimeDate);
- LinkedHashMap<String,List<Date>> yearTimeMap = (LinkedHashMap<String, List<Date>>) DateUtil.getYearListDesc(startTimeDate, endTimeDate);;
+ LinkedHashMap<String,List<Date>> yearTimeMap = (LinkedHashMap<String, List<Date>>) DateUtil.getYearListDesc(startTimeDate, endTimeDate);
Map<String,List<Date>> yearTimeDescMap = new LinkedHashMap<>();
boolean existDefaultYear = false;
if(nowYear == beforeYear){ //榛樿琛ㄥ彧鏈夋湰骞村害鐨�(瓒呰繃浜嗗崐骞�,榛樿琛ㄨ褰曞叏閮ㄥ彧鏈夋湰骞村害鐨�,鍚屾椂浼氱敓鎴愪簡褰撳墠骞村害鐨勫垎琛�)
@@ -382,7 +382,8 @@
defaultTableStartTime.set(Calendar.SECOND,defaultTableStartTime.getActualMinimum(Calendar.SECOND));
//缁堟鏃堕棿璁剧疆涓哄綋鍓嶆椂闂�
List<Date> defaultDateList = new LinkedList<>();
- defaultDateList.add(defaultTableStartTime.getTime());
+ //defaultDateList.add(defaultTableStartTime.getTime());
+ defaultDateList.add(startTimeDate);
defaultDateList.add(endTimeDate);
yearTimeMap.put("default",defaultDateList);
--
Gitblit v1.9.1