From 7e408b4de778506c1544fa8f34ff289dd8b8c8df Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 26 三月 2024 15:27:25 +0800
Subject: [PATCH] #完善工具类

---
 src/main/java/com/zy/crm/manager/utils/TimeCalculatorUtils.java |   89 ++++++++++++++++++++++++++++++++------------
 1 files changed, 64 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/zy/crm/manager/utils/TimeCalculatorUtils.java b/src/main/java/com/zy/crm/manager/utils/TimeCalculatorUtils.java
index ca9514d..2fe5354 100644
--- a/src/main/java/com/zy/crm/manager/utils/TimeCalculatorUtils.java
+++ b/src/main/java/com/zy/crm/manager/utils/TimeCalculatorUtils.java
@@ -169,6 +169,15 @@
     }
 
     //鑾峰彇鐜板湪鏃ユ湡鏄綋鏈堢鍑犲懆
+    public static int WeeklyNowMonthDay(Date date) {
+//        int day = timeDay(date);
+//        if (day<7){
+//            if (WeeklyNowMonth(WeeklyMonday(date))>2){
+//                return 1;
+//            }
+//        }
+        return WeeklyNowMonth(WeeklyMonday(date));
+    }
     public static int WeeklyNowMonth(Date date) {
 //        LocalDate currentDate = LocalDate.now();
         LocalDate currentDate = LocalDate.of(timeYest(date), timeMonth(date), timeDay(date));
@@ -255,7 +264,7 @@
     //鑾峰彇鏈懆鍛ㄤ竴
     public static Date WeeklyMonday (Date date) {
         LocalDate localDate = LocalDate.of(timeYest(date), timeMonth(date), timeDay(date));
-        // 鍒ゆ柇鏄笉鏄懆涓� 鍒欏皢瀹冭皟鏁村埌涓嬪懆鍛ㄤ竴
+        // 涓嬪懆鍛ㄤ竴
         localDate = localDate.with(TemporalAdjusters.next(DayOfWeek.MONDAY));
 
         // 灏哃ocalDate杞崲涓篋ate
@@ -298,30 +307,60 @@
 
     public static void main(String[] args) {
         Date now = new Date();
-        //鏈懆
-        List<Date> dateList = WeeklyMondayAndSundayNow(now);
-        for (Date date : dateList){
-            System.out.println("------------------------------");
-            System.out.println(date);
-        }
-        //涓婂懆
-        List<Date> dateList1 = WeeklyMondayAndSundayFront(now);
-        for (Date date : dateList1){
-            System.out.println("------------------------------");
-            System.out.println(date);
-        }
-        //涓嬪懆
-        List<Date> dateList2 = WeeklyMondayAndSundayAfter(now);
-        for (Date date : dateList2){
-            System.out.println("------------------------------");
-            System.out.println(date);
-        }
-        //鍛�
-        List<Date> dateList3 = WeeklyDays(now);
-        for (Date date : dateList3){
-            System.out.println("------------------------------");
-            System.out.println(date);
-        }
+        int weeklyNowMonth = WeeklyNowMonthDay(now);
+        System.out.println("褰撳墠鏃ユ湡鏄 " + weeklyNowMonth + " 鍛�");
+
+        LocalDate startDate1 = LocalDate.of(2024, 2, 29);
+        int weeklyNowMonth1 = WeeklyNowMonthDay(DateLocalDate(startDate1));
+        System.out.println("褰撳墠鏃ユ湡鏄 " + weeklyNowMonth1 + " 鍛�");
+
+        LocalDate startDate2 = LocalDate.of(2024, 3, 5);
+        int weeklyNowMonth2 = WeeklyNowMonthDay(DateLocalDate(startDate2));
+        System.out.println("褰撳墠鏃ユ湡鏄 " + weeklyNowMonth2 + " 鍛�");
+
+        LocalDate startDate3 = LocalDate.of(2024, 3, 10);
+        int weeklyNowMonth3 = WeeklyNowMonthDay(DateLocalDate(startDate3));
+        System.out.println("褰撳墠鏃ユ湡鏄 " + weeklyNowMonth3 + " 鍛�");
+
+        LocalDate startDate4 = LocalDate.of(2024, 3, 31);
+        int weeklyNowMonth4 = WeeklyNowMonthDay(DateLocalDate(startDate4));
+        System.out.println("褰撳墠鏃ユ湡鏄 " + weeklyNowMonth4 + " 鍛�");
+
+        LocalDate startDate5 = LocalDate.of(2024, 4, 1);
+        int weeklyNowMonth5 = WeeklyNowMonthDay(DateLocalDate(startDate5));
+        System.out.println("褰撳墠鏃ユ湡鏄 " + weeklyNowMonth5 + " 鍛�");
+
+        LocalDate startDate6 = LocalDate.of(2024, 4, 7);
+        int weeklyNowMonth6 = WeeklyNowMonthDay(DateLocalDate(startDate6));
+        System.out.println("褰撳墠鏃ユ湡鏄 " + weeklyNowMonth6 + " 鍛�");
     }
 
+//    public static void main(String[] args) {
+//        Date now = new Date();
+//        //鏈懆
+//        List<Date> dateList = WeeklyMondayAndSundayNow(now);
+//        for (Date date : dateList){
+//            System.out.println("------------------------------");
+//            System.out.println(date);
+//        }
+//        //涓婂懆
+//        List<Date> dateList1 = WeeklyMondayAndSundayFront(now);
+//        for (Date date : dateList1){
+//            System.out.println("------------------------------");
+//            System.out.println(date);
+//        }
+//        //涓嬪懆
+//        List<Date> dateList2 = WeeklyMondayAndSundayAfter(now);
+//        for (Date date : dateList2){
+//            System.out.println("------------------------------");
+//            System.out.println(date);
+//        }
+//        //鍛�
+//        List<Date> dateList3 = WeeklyDays(now);
+//        for (Date date : dateList3){
+//            System.out.println("------------------------------");
+//            System.out.println(date);
+//        }
+//    }
+
 }

--
Gitblit v1.9.1