Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

jiangping

2024-05-08 be0301e67768fb183df7e29f411a7e54dbf15c40

 server/service/src/main/java/com/doumee/core/utils/DateUtil.java

@@ -6,6 +6,8 @@
import java.text.DateFormatSymbols;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.Period;
import java.util.Calendar;
import java.util.Date;
import java.util.Enumeration;
@@ -3183,27 +3185,34 @@
//                )

//        );

        LocalDate startDate= LocalDate.of(2021,2,28);
        LocalDate endDate =LocalDate.of(2022,4,5);
        Period period = Period.between(startDate,endDate);
        int months = period.getYears()* 12 + period.getMonths();
        System.out.println("Months between the two dates: " + months);


/*        Calendar calo = Calendar.getInstance();
        Calendar caln = Calendar.getInstance(); // ,"yyyy-MM-dd HH:mm:ss"
        caln.setTime(DateUtil.StringToDate("2024-03-06 23:59:59"));
        calo.setTime(DateUtil.StringToDate("2024-02-05 00:00:00"));
        System.out.println( DateUtil.calculateMonthsBetweenDates(calo,caln));*/

//        System.out.println(
//                DateUtil.DateToStr(
//                        DateUtil.getNextMonthFirst(new Date())
//                        ,"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")

        );
//        );
//        System.out.println(
//                DateUtil.DateToStr(
//                        DateUtil.getNextMonthFirst(
//                                DateUtil.StringToDate("2024-12-29 21:59:59")
//                        )
//                        ,"yyyy-MM-dd HH:mm:ss")
//
//        );