From e43b01ad3497d7f6249e32207451b10d2993a9f2 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期一, 10 七月 2023 10:40:20 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/fg_v2.0
---
src/main/java/com/whyc/util/DateUtil.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/whyc/util/DateUtil.java b/src/main/java/com/whyc/util/DateUtil.java
index e125050..8029da1 100644
--- a/src/main/java/com/whyc/util/DateUtil.java
+++ b/src/main/java/com/whyc/util/DateUtil.java
@@ -352,24 +352,17 @@
public static Map<String,List<Date>> getQueryTimeForSubTablesDesc(Date startTimeDate,Date endTimeDate) throws ParseException {
//鏍规嵁绛涢�夌殑鏃堕棿娈�,鏌ヨ鍑虹鍚堣姹傜殑鍚勫垎琛ㄨ褰曟暟
//棣栧厛,濡傛灉褰撳墠鏃堕棿瓒呰繃7鏈�,榛樿琛ㄤ腑鍙湁鏈勾搴︾殑;濡傛灉娌¤秴杩�7鏈�,榛樿琛ㄨ繕瀛樺湪涓婁竴骞村害鐨勮褰�
- Calendar instance = Calendar.getInstance();
- if(endTimeDate.compareTo(instance.getTime())>0){ //鏍￠獙浼樺寲鏈�澶ф煡璇㈡椂闂�
- endTimeDate = instance.getTime();
+ Calendar now = Calendar.getInstance();
+ if(endTimeDate.compareTo(now.getTime())>0){ //鏍￠獙浼樺寲鏈�澶ф煡璇㈡椂闂�
+ endTimeDate = now.getTime();
}
- int nowYear = instance.get(Calendar.YEAR);
- instance.add(Calendar.MONTH,-6);
- int beforeYear = instance.get(Calendar.YEAR);
- Date beforeYearTime = instance.getTime();
- instance.setTime(endTimeDate);
- int endTimeYear = instance.get(Calendar.YEAR);
-
- Calendar startTime = Calendar.getInstance();
- startTime.setTime(startTimeDate);
+ Calendar timeBefore7Month = Calendar.getInstance();
+ timeBefore7Month.add(Calendar.MONTH,-7);
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){ //榛樿琛ㄥ彧鏈夋湰骞村害鐨�(瓒呰繃浜嗗崐骞�,榛樿琛ㄨ褰曞叏閮ㄥ彧鏈夋湰骞村害鐨�,鍚屾椂浼氱敓鎴愪簡褰撳墠骞村害鐨勫垎琛�)
+ /*if(nowYear == beforeYear){ //榛樿琛ㄥ彧鏈夋湰骞村害鐨�(瓒呰繃浜嗗崐骞�,榛樿琛ㄨ褰曞叏閮ㄥ彧鏈夋湰骞村害鐨�,鍚屾椂浼氱敓鎴愪簡褰撳墠骞村害鐨勫垎琛�)
//濡傛灉鏌ヨ鏃堕棿鑼冨洿鍖呭惈褰撳墠骞村害,鍒欓渶瑕佹煡璇㈤粯璁よ〃
if(startTime.get(Calendar.YEAR) >= nowYear && endTimeYear <= nowYear){
//寮�濮嬫椂闂磋缃勾搴﹀垵濮嬫椂闂�
@@ -404,6 +397,14 @@
yearTimeMap.put("default",defaultDateList);
existDefaultYear = true;
}
+ }*/
+ if(startTimeDate.before(now.getTime()) || endTimeDate.after(timeBefore7Month.getTime())){
+ List<Date> defaultDateList = new LinkedList<>();
+ defaultDateList.add(startTimeDate);
+ defaultDateList.add(endTimeDate);
+
+ yearTimeMap.put("default",defaultDateList);
+ existDefaultYear = true;
}
//璋冩暣涓嬮『搴�,灏哾efault璋冩暣鍒伴浣�
if(existDefaultYear){
--
Gitblit v1.9.1