From 31a2a1e82c6d1a80b62ef65bcfba46e084e372aa Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 31 一月 2024 09:37:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/core/utils/DateUtil.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/core/utils/DateUtil.java b/server/service/src/main/java/com/doumee/core/utils/DateUtil.java
index 45bdcc0..e6e6b7e 100644
--- a/server/service/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/server/service/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -3111,9 +3111,22 @@
public static void main(String[] args) {
- System.out.println(DateUtil.DateToStr(DateUtil.afterDateByType(
- DateUtil.stringToDate("2024-02-01","yyyy-MM-dd")
- ,1,1),"yyyy-MM-dd HH:mm:ss"));
+// System.out.println(DateUtil.DateToStr(DateUtil.afterDateByType(
+// DateUtil.stringToDate("2024-02-01","yyyy-MM-dd")
+// ,1,1),"yyyy-MM-dd HH:mm:ss"));
+
+ System.out.println( DateUtil.daysBetweenDates(DateUtil.stringToDate("2024-02-29","yyyy-MM-dd"),
+ DateUtil.stringToDate("2024-02-01","yyyy-MM-dd"))
+ );
+
+ System.out.println(DateUtil.calculateBetween(DateUtil.StringToDate("2024-02-29 23:59:59"),DateUtil.StringToDate("2024-02-01 00:00:00"),0));
+
+
+// Calendar calo = Calendar.getInstance();
+// Calendar caln = Calendar.getInstance(); // ,"yyyy-MM-dd HH:mm:ss"
+// caln.setTime(DateUtil.StringToDate("2024-02-29 23:59:59"));
+// calo.setTime(DateUtil.StringToDate("2024-02-01 00:00:00"));
+// System.out.println( DateUtil.calculateDaysBetweenDates(calo,caln));
}
--
Gitblit v1.9.3