From 02bc3bfe47e3d5311a0bb041c94e70a34b1ca73c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 09 四月 2024 09:03:01 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/core/utils/DateUtil.java | 92 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 86 insertions(+), 6 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 e6e6b7e..893375e 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);
@@ -2995,6 +2995,21 @@
return calendar.getTime();
}
+ /**
+ * 鑾峰彇鎸囧畾鏃ユ湡鐨勪笅涓湀绗竴澶�
+ * @param date
+ * @return
+ */
+ public static Date getNextMonthFirst(Date date){
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date);
+ calendar.add(Calendar.MONTH, 1); // 灏嗘棩鍘嗙殑鏈堜唤澧炲姞1
+ calendar.set(Calendar.DAY_OF_MONTH, 1); // 璁剧疆涓轰笅涓湀鐨勭涓�澶�
+ return calendar.getTime();
+ }
+
+
+
public static String afterDateToStr(Integer days){
Date date = new Date();
@@ -3109,24 +3124,89 @@
}
+ /**
+ * 鎷兼帴鏃ユ湡鏁版嵁
+ * @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.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.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));
+
+ System.out.println(
+ DateUtil.DateToStr(
+ DateUtil.getNextMonthFirst(new Date())
+ ,"yyyy-MM-dd HH:mm:ss")
+
+ );
+ System.out.println(
+ DateUtil.DateToStr(
+ DateUtil.getNextMonthFirst(
+ DateUtil.StringToDate("2024-12-29 21:59:59")
+ )
+ ,"yyyy-MM-dd HH:mm:ss")
+
+ );
+
+
+
}
--
Gitblit v1.9.3