1、课程调整时排除自动补签记录

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

@@ -1304,27 +1304,27 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             if (Objects.isNull(newCourseSchedule.getSchoolId())) {
                 newCourseSchedule.setSchoolId(oldCourseSchedule.getSchoolId());
             }
+            int settlementNum = courseScheduleTeacherSalaryDao.checkCourseIsSettlement(oldCourseSchedule.getId().intValue());
+            if (settlementNum > 0) {
+                throw new BizException("{}[{}]{}-{}课程已结算的",
+                        oldCourseSchedule.getName(),
+                        oldCourseSchedule.getId(),
+                        DateUtil.dateToString(oldCourseSchedule.getStartClassTime(),
+                                DateUtil.EXPANDED_DATE_TIME_FORMAT),
+                        DateUtil.dateToString(oldCourseSchedule.getEndClassTime(),
+                                DateUtil.EXPANDED_DATE_TIME_FORMAT));
+            }
+            int num = studentAttendanceDao.countStudentAttendenceNum(oldCourseSchedule.getId().intValue());
+            if (num > 0) {
+                throw new BizException("{}[{}]{}-{}课程已点名",
+                        oldCourseSchedule.getName(),
+                        oldCourseSchedule.getId(),
+                        DateUtil.dateToString(oldCourseSchedule.getStartClassTime(),
+                                DateUtil.EXPANDED_DATE_TIME_FORMAT),
+                        DateUtil.dateToString(oldCourseSchedule.getEndClassTime(),
+                                DateUtil.EXPANDED_DATE_TIME_FORMAT));
+            }
             if (oldCourseSchedule.getType().equals(CourseSchedule.CourseScheduleType.VIP)) {
-                int settlementNum = courseScheduleTeacherSalaryDao.checkCourseIsSettlement(oldCourseSchedule.getId().intValue());
-                if (settlementNum > 0) {
-                    throw new BizException("{}[{}]{}-{}课程已结算的",
-                            oldCourseSchedule.getName(),
-                            oldCourseSchedule.getId(),
-                            DateUtil.dateToString(oldCourseSchedule.getStartClassTime(),
-                                    DateUtil.EXPANDED_DATE_TIME_FORMAT),
-                            DateUtil.dateToString(oldCourseSchedule.getEndClassTime(),
-                                    DateUtil.EXPANDED_DATE_TIME_FORMAT));
-                }
-                int num = studentAttendanceDao.countStudentAttendenceNum(oldCourseSchedule.getId().intValue());
-                if (num > 0) {
-                    throw new BizException("{}[{}]{}-{}课程已点名",
-                            oldCourseSchedule.getName(),
-                            oldCourseSchedule.getId(),
-                            DateUtil.dateToString(oldCourseSchedule.getStartClassTime(),
-                                    DateUtil.EXPANDED_DATE_TIME_FORMAT),
-                            DateUtil.dateToString(oldCourseSchedule.getEndClassTime(),
-                                    DateUtil.EXPANDED_DATE_TIME_FORMAT));
-                }
                 VipGroup vipGroup = vipGroupDao.get(Long.valueOf(oldCourseSchedule.getMusicGroupId()));
                 if(Objects.isNull(vipGroup)){
                     throw new BizException("课程不存在");