From 9a819fa35464df79a1a8a56e132b3463fac520a7 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期日, 07 四月 2024 18:59:08 +0800
Subject: [PATCH] mrshi
---
server/service/src/main/java/com/doumee/core/utils/DateUtil.java | 68 ++++++++++++++++++++++++++++++++--
1 files changed, 64 insertions(+), 4 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..a56ff98 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
@@ -1298,7 +1298,7 @@
calo.setTime(oldDate);
caln.setTime(newDate);
if(type==0||type==1){
- return calculateDaysBetweenDates(caln, calo) ;
+ return calculateDaysBetweenDates(caln, calo) + 1 ;
}else if(type==2){
int day = caln.get(Calendar.DATE);
@@ -3109,11 +3109,71 @@
}
+ /**
+ * 鎷兼帴鏃ユ湡鏁版嵁
+ * @param date
+ * @param optType 1:姣忔棩寮�濮� 2锛氭瘡鏃ョ粨鏉� 3:鏄ㄦ棩缁撴潫
+ * @return
+ */
+ public static Date getMontageDate(Date date ,Integer optType) {
+ String strShortDate = DateUtil.dateToString(date,"yyyy-MM-dd");
+ if(optType.equals(1)){
+ return DateUtil.StringToDate(strShortDate +" 00:00:00");
+ }else if(optType.equals(2)){
+ return DateUtil.StringToDate(strShortDate +" 23:59:59");
+ }else if(optType.equals(3)){
+ strShortDate = DateUtil.dateToString(DateUtil.getDateBetween(date,-1),"yyyy-MM-dd");
+ return DateUtil.StringToDate(strShortDate +" 23:59:59");
+ }else{
+ return null;
+ }
+ }
+
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));
+
+
+ System.out.println(
+ DateUtil.DateToStr(
+
+ DateUtil.getMontageDate(DateUtil.StringToDate("2024-02-29 21:59:59"),1) ,"yyyy-MM-dd HH:mm:ss"
+ )
+ );
+
+
+
+ System.out.println(
+
+ DateUtil.DateToStr(
+
+ DateUtil.getMontageDate(DateUtil.StringToDate("2024-02-29 21:59:59"),2) ,"yyyy-MM-dd HH:mm:ss"
+ )
+
+ );
+
+ System.out.println(
+
+ DateUtil.DateToStr(
+
+ DateUtil.getMontageDate(DateUtil.StringToDate("2024-02-29 21:59:59"),3) ,"yyyy-MM-dd HH:mm:ss"
+ )
+
+ );
+
+// 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