From 870dfdba90fc4062b66de669ad9ff3f4707bf496 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 09 六月 2025 10:32:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/service/src/main/java/com/doumee/core/utils/DateUtil.java | 15 ++++++++++++---
1 files changed, 12 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 6860dfb..065ac27 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
@@ -94,10 +94,12 @@
/**
* 寰楀嚭涓や釜鏃ユ湡涔嬮棿鐨勯棿闅斿皬鏃�
*
- * @param fromDate
+ * @param fromDate 闈犲墠鐨勬椂闂�
* 鏍煎紡涓簓yyy-MM-dd
- * @param toDate
+ * @param toDate 闈犲悗鐨勬椂闂�
* 鏍煎紡涓簓yyy-MM-dd
+ * DateUtil.getBetweenHours(DateUtil.fromStringToDate("yyyy-MM-dd HH:mm:ss","2025-05-26 10:46:43"),
+ * DateUtil.fromStringToDate("yyyy-MM-dd HH:mm:ss","2025-05-26 07:41:43")) 杩斿洖 -2灏忔椂
* @return int
*/
public static long getBetweenHours(Date fromDate, Date toDate) {
@@ -3202,7 +3204,14 @@
public static void main(String[] args) throws Exception{
- System.out.println(DateUtil.StringToDate("2025-05-16 13:49:40").getTime());
+ System.out.println(DateUtil.DateToStr(
+ DateUtil.afterDateByType(new Date(),1,-11),"yyyy-MM")
+ );
+//
+// System.out.println(DateUtil.getBetweenHours(DateUtil.fromStringToDate("yyyy-MM-dd HH:mm:ss","2025-05-26 10:46:43"),
+// DateUtil.fromStringToDate("yyyy-MM-dd HH:mm:ss","2025-05-26 07:41:43")));
+// ;
+
// System.out.println(DateUtil.getLongDateTime(new Date()));;
}
--
Gitblit v1.9.3