From 53b6400ec10c8ca61ccec91c82c358d2488eead8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 20 十二月 2024 09:50:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java | 47 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
index e27187a..894d2d5 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -2911,14 +2911,17 @@
// System.out.println(DateUtil.afterMinutesDate(-5));
- List<Date> list =getThisMonthDateList();
- for(Date d :list){
- System.out.println(getPlusTime2(d));
- }
- List<Date> list1 =getThisYearMonthList();
- for(Date d :list1){
- System.out.println(getPlusTime2(d));
- }
+ System.out.println(DateUtil.getBeforMonthStr(new Date(),1));
+ System.out.println(DateUtil.getBeforMonthStr(new Date(),12));
+
+// List<Date> list =getThisMonthDateList();
+// for(Date d :list){
+// System.out.println(getPlusTime2(d));
+// }
+// List<Date> list1 =getThisYearMonthList();
+// for(Date d :list1){
+// System.out.println(getPlusTime2(d));
+// }
// Date startTime = DateUtil.StringToDate("2024-05-01 08:00:00" ,"yyyy-MM-dd HH:mm:ss");
// Date endTime = DateUtil.StringToDate("2024-05-01 17:00:00" ,"yyyy-MM-dd HH:mm:ss");
@@ -3389,4 +3392,32 @@
}
+ /**
+ * 鑾峰彇X澶╁悗鐨勬棩鏈�
+ * @param date
+ * @param beforMonths 涓嬫湀 -1 涓婃湀 1
+ * @return
+ */
+ public static String getBeforMonthStr(Date date,Integer beforMonths){
+ ZonedDateTime zonedDateTime = date.toInstant().atZone(ZoneId.systemDefault());
+ // 杞崲涓簀ava.time.LocalDate,璁＄畻x澶╃殑鏃ユ湡
+ LocalDate dateBeforeDay = zonedDateTime.toLocalDate().minusMonths(beforMonths);
+ return dateBeforeDay.toString();
+ }
+
+
+ /**
+ * 鑾峰彇X骞村悗鐨勬棩鏈�
+ * @param date
+ * @param beforMonths 涓嬪勾 -1 涓婂勾 1
+ * @return
+ */
+ public static String getBeforYear(Date date,Integer beforMonths){
+ ZonedDateTime zonedDateTime = date.toInstant().atZone(ZoneId.systemDefault());
+ // 杞崲涓簀ava.time.LocalDate,璁＄畻x澶╃殑鏃ユ湡
+ LocalDate dateBeforeDay = zonedDateTime.toLocalDate().minusYears(beforMonths);
+ return dateBeforeDay.toString();
+ }
+
+
}
\ No newline at end of file
--
Gitblit v1.9.3