Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev

sfd

2025-05-09 644c6b5f5808c49f59d27f2ed9400cc70c4dd22a

 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWorkCalendarServiceImpl.java

@@ -152,9 +152,6 @@
        //生成日历基础数据
        LinkedHashMap<String, String> baseCalendar = new LinkedHashMap<>();
        for (LocalDate date : dates) {
            String dayOfWeekChinese = getChineseDayOfWeek(date.getDayOfWeek());
            String dayOfWeekEnglish = date.getDayOfWeek().getDisplayName(java.time.format.TextStyle.FULL, Locale.ENGLISH);
            System.out.println(date + " - " + dayOfWeekChinese + " (" + dayOfWeekEnglish + ")");
            baseCalendar.put(date+"", "");
        }
        try {
@@ -221,11 +218,11 @@
        List<LocalDate> dates = getDatesBetween(startDate, endDate);

        // 打印结果
        for (LocalDate date : dates) {
            String dayOfWeekChinese = getChineseDayOfWeek(date.getDayOfWeek());
            String dayOfWeekEnglish = date.getDayOfWeek().getDisplayName(java.time.format.TextStyle.FULL, Locale.ENGLISH);
            System.out.println(date + " - " + dayOfWeekChinese + " (" + dayOfWeekEnglish + ")");
        }
//        for (LocalDate date : dates) {
//            String dayOfWeekChinese = getChineseDayOfWeek(date.getDayOfWeek());
//            String dayOfWeekEnglish = date.getDayOfWeek().getDisplayName(java.time.format.TextStyle.FULL, Locale.ENGLISH);
//            System.out.println(date + " - " + dayOfWeekChinese + " (" + dayOfWeekEnglish + ")");
//        }
        return dates;
    }