1

admin-core/src/main/java/com/ibeetl/admin/core/util/holidays/HolidaysUtils.java

@@ -38,7 +38,7 @@ public abstract class HolidaysUtils {
     private static final String githubHolidaysURL2 = "https://cdn.jsdelivr.net/gh/NateScarlet/holiday-cn@master/%s.json";
 
     /**
-     * 获取今年的节假日列表
+     * 获取今年的节假日列表，目前是有人维护的库
      * @return
      */
     public static Holidays get() {

web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java

@@ -224,7 +224,10 @@ public class TeacherOpenCourseScheduleSessionService extends CoreBaseService<Tea
 
             // 获取节假日列表，只获取节假日中的休息日，非休息日则是需要补班的日期。
             List<String> collect = holidays.getDays().stream().filter(Day::getOffDay).map(Day::getDate).collect(Collectors.toList());
-            dateTimes = dateTimes.stream().filter(dt -> !collect.stream().anyMatch(e -> e.equals(DateUtil.format(dt, NORM_DATE_PATTERN))))
+            dateTimes = dateTimes.stream()
+                    .filter(dateTime ->
+                            // 过滤掉节假日
+                            !collect.stream().anyMatch(e -> e.equals(DateUtil.format(dateTime, NORM_DATE_PATTERN))))
                     .collect(Collectors.toList());
         }
 
@@ -232,7 +235,14 @@ public class TeacherOpenCourseScheduleSessionService extends CoreBaseService<Tea
         if (ObjectUtil.isNotEmpty(options.getWeekDetail())) {
 
             // 指定星期的日期时间
-            dateTimes = dateTimes.stream().filter(dt -> options.getWeekDetail().stream().anyMatch(e -> e.getWeekNumber().equals(DateUtil.dayOfWeek(dt))))
+            dateTimes = dateTimes.stream()
+                    .filter(dateTime ->
+                            // 判断指定星期的日期，是否在多选框中
+                            options.getWeekDetail().stream()
+                                    // 星期转成数字进行比较
+                                    .anyMatch(e -> e.getWeekNumber().equals(DateUtil.dayOfWeek(dateTime))
+                            )
+                    )
                     .collect(Collectors.toList());
         }
 
@@ -241,7 +251,7 @@ public class TeacherOpenCourseScheduleSessionService extends CoreBaseService<Tea
         final TeacherOpenCourseScheduleSessionClassQuery classQuery = new TeacherOpenCourseScheduleSessionClassQuery();
 
         // 循环遍历 天
-        for (DateTime dt: dateTimes) {
+        for (DateTime dateTime: dateTimes) {
             // 课表主表保存
             TeacherOpenCourseScheduleSession tocss = new TeacherOpenCourseScheduleSession();
             tocss.setTeacherOpenCourseScheduleSessionAddTime(new Date());
@@ -272,7 +282,7 @@ public class TeacherOpenCourseScheduleSessionService extends CoreBaseService<Tea
                     item.setTeacherOpenCourseScheduleSessionSnapStatus(1);
                     item.setTeacherOpenCourseScheduleSessionId(tocss.getTeacherOpenCourseScheduleSessionId());
                     item.setTeacherOpenCourseScheduleSessionClassName(className);
-                    item.setTeacherOpenCourseScheduleSessionDayTime(dt.toString(NORM_DATE_PATTERN));
+                    item.setTeacherOpenCourseScheduleSessionDayTime(dateTime.toString(NORM_DATE_PATTERN));
                     item.setTeacherOpenCourseId(tocss.getTeacherOpenCourseId());
                 });