From c977f0e2fd86ca3e9e3ad3961f702206c41d2767 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 19 二月 2025 10:41:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/services/src/main/java/com/doumee/core/utils/DateUtil.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 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 689c112..575ab4e 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
@@ -68,6 +68,15 @@
return dt1;
}
+ public static String getXDaysAfter(Date date, Integer days){
+ Timestamp currentTimestamp = new Timestamp(date.getTime());
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(currentTimestamp);
+ calendar.add(Calendar.DAY_OF_YEAR, days-1); // 鍦ㄥ綋鍓嶆椂闂村熀纭�涓婃坊鍔犳寚瀹氱殑澶╂暟
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+ return formatter.format(calendar.getTime());
+ }
+
/**
* @author Pablo Descrption:取锟矫碉拷前锟斤拷锟斤拷getgetg get Date format
* Example锛�2008-05-15
@@ -2154,19 +2163,19 @@
/**
* 寰楀嚭涓や釜鏃ユ湡涔嬮棿鐨勯棿闅斿ぉ鏁�
*
- * @param strFromDate
+ * @param smallDate
* 鏍煎紡涓簓yyy-MM-dd
- * @param strToDate
+ * @param bigDate
* 鏍煎紡涓簓yyy-MM-dd
* @return int
*/
- public static long getBetweenDays(String strFromDate, String strToDate) {
+ public static long getBetweenDays(String smallDate, String bigDate) {
long m_intervalday = 0;// 鍒濆鍖栨椂闂撮棿闅旂殑鍊间负0
// 浣跨敤鐨勬椂闂存牸寮忎负yyyy-MM-dd
SimpleDateFormat m_simpledateformat = new SimpleDateFormat("yyyy-MM-dd");
try {
- Date fromDate = m_simpledateformat.parse(strFromDate);
- Date toDate = m_simpledateformat.parse(strToDate);
+ Date fromDate = m_simpledateformat.parse(smallDate);
+ Date toDate = m_simpledateformat.parse(bigDate);
m_intervalday = toDate.getTime() - fromDate.getTime();// 璁＄畻鎵�寰椾负寰鏁�
m_intervalday = m_intervalday / 1000 / 60 / 60 / 24;// 璁＄畻鎵�寰楃殑澶╂暟
@@ -2762,8 +2771,7 @@
public static void main(String[] args) {
try {
- System.out.println((int)(3.222));
-
+ System.out.println(DateUtil.getBetweenDays("2025-02-13","2025-02-15"));
} catch (Exception ex) {
ex.printStackTrace();
}
--
Gitblit v1.9.3