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 |   85 +++++++++++++++++++++++++++++-------------
 1 files changed, 59 insertions(+), 26 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 a56ff98..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
@@ -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();
@@ -3142,38 +3157,56 @@
 //        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(
+//        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"
+//                )
 
-                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