From 462a7c752afead89a100522aea8bbfadaea2aab9 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 13 十月 2025 09:42:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/core/utils/DateUtil.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/core/utils/DateUtil.java b/server/services/src/main/java/com/doumee/core/utils/DateUtil.java
index dcf6ec1..02efdb3 100644
--- a/server/services/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/server/services/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -1380,6 +1380,9 @@
return (int) days;
}
+
+
+
public static int daysBetweenDates11(Date newDate, Date oldDate) {
int days = 0;
Calendar calo = Calendar.getInstance();
@@ -2054,7 +2057,12 @@
*/
public static String getCurrDateTime() {
Timestamp date = new Timestamp(System.currentTimeMillis());
- SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ return formatter.format(date);
+ }
+ public static String getCurrDateTimeShort() {
+ Timestamp date = new Timestamp(System.currentTimeMillis());
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMddHHmmss");
return formatter.format(date);
}
@@ -2944,9 +2952,9 @@
// 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");
-// Long intervalTime = 35L;
+ Date startTime = DateUtil.StringToDate("2024-05-01" ,"yyyy-MM-dd");
+ Date endTime = DateUtil.StringToDate("2024-06-02" ,"yyyy-MM-dd");
+ System.out.println(DateUtil.daysBetweenDates(endTime,startTime));
//
//
// DateUtil.checkDateInterval( startTime.toInstant()
--
Gitblit v1.9.3