1、课程顺延

2、点名无教学点兼容
3、乐团详情 课表详情null
4、vip课新增指定学员
5、请假审批异常处理
6、节假日错误问题

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -1003,9 +1003,14 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         Map<String, Integer> holidayDays = new HashMap<>();
         Map<Integer, Map<String, Integer>> holiday = new HashMap<>();
 
-        if (vipGroupCourseAdjustInfo.isHoliday()) {
-            holiday = jiaRiFeignService.query(calendar.get(Calendar.YEAR));
-            holidayDays = holiday.get(calendar.get(Calendar.YEAR));
+        try {
+            if (vipGroupCourseAdjustInfo.isHoliday()) {
+                holiday = jiaRiFeignService.query(calendar.get(Calendar.YEAR));
+                holidayDays = holiday.get(calendar.get(Calendar.YEAR));
+            }
+        } catch (DecodeException e) {
+            LOGGER.error("节假日解析错误");
+            vipGroupCourseAdjustInfo.setHoliday(false);
         }
 
         while (true) {
@@ -1185,7 +1190,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
         Map<String, Integer> holidayDays = new HashMap<>();
         Map<Integer, Map<String, Integer>> holiday = new HashMap<>();
-        ;
+
         try {
             if (vipGroupCourseAdjustInfo.isHoliday()) {
                 holiday = jiaRiFeignService.query(calendar.get(Calendar.YEAR));
@@ -2085,10 +2090,15 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
         Map<String, Integer> holidayDays = new HashMap<>();
         Map<Integer, Map<String, Integer>> holiday = new HashMap<>();
-        ;
-        if (courseGenerateInfo.isSkipHoliday()) {
-            holiday = jiaRiFeignService.query(calendar.get(Calendar.YEAR));
-            holidayDays = holiday.get(calendar.get(Calendar.YEAR));
+
+        try {
+            if (courseGenerateInfo.isSkipHoliday()) {
+                holiday = jiaRiFeignService.query(calendar.get(Calendar.YEAR));
+                holidayDays = holiday.get(calendar.get(Calendar.YEAR));
+            }
+        } catch (DecodeException e) {
+            LOGGER.error("节假日解析错误");
+            courseGenerateInfo.setSkipHoliday(false);
         }
 
         List<CourseSchedule> courseSchedules = new ArrayList<>();