Merge remote-tracking branch 'origin/master'

doum

2025-10-23 ace847c89da4a0a772aa513b4343d8fc54a0adc9

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

@@ -1733,11 +1733,22 @@
    }
    public static Date getFirstThisYearDate() {
        try {
            return sdfShort.parse( getNowShortDate().substring(0, 4) + "0101");
            return sdfLong.parse( getNowShortDate().substring(0, 4) + "-01-01");
        } catch (Exception e) {
            return null;
        }
    }

    public static Date getFirstThisMonthDate() {
        try {
            return sdfLong.parse( getNowFormateDate().substring(0, 7) + "-01");
        } catch (Exception e) {
            return null;
        }
    }



    public static String getFirstDayCurrentMonth() {
        try {
            return getDateLong(new Date()).substring(0, 7) + "-01";
@@ -2931,8 +2942,9 @@
//            Date date1 = getISO8601DateByStr("2024-06-14T08:46:36.014+08:00");
//            System.out.println(DateUtil.afterMinutesDate(-5));

            System.out.println(DateUtil.getFirstThisMonthDate());

            System.out.println(getPlusTime2(DateUtil.addMonthToDate(new Date(),-1)));
//            System.out.println(getPlusTime2(DateUtil.addMonthToDate(new Date(),-1)));
//            System.out.println(DateUtil.getBeforMonthStr(new Date(),12));

//            List<Date> list =getThisMonthDateList();
@@ -3602,4 +3614,13 @@
        gc.setTime(date);
        return gc.get(2) + 1;
    }

    public static int getNowDayNum(){
        // 获取Calendar实例
        Calendar calendar = Calendar.getInstance();
        return calendar.get(Calendar.DAY_OF_MONTH);
    }



}