1、陪练课调整

2、付费陪练课可预约时间调整

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

@@ -754,6 +754,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         Map<Integer, IntegerAndIntegerListDto> classGroupTeachingTeacherMap = classGroupAndUserIdsMap.stream()
                 .collect(Collectors.toMap(IntegerAndIntegerListDto::getId, integerAndIntegerListDto -> integerAndIntegerListDto));
 
+        Set<Long> existCourseScheduleIdsSet=new HashSet<>(existCourseScheduleIds);
+
         Map<Date, List<CourseSchedule>> existClassDateCoursesMap = allCourseSchedules.stream().collect(Collectors.groupingBy(CourseSchedule::getClassDate));
         Map<Date, List<CourseSchedule>> newClassDateCoursesMap = courseSchedules.stream().collect(Collectors.groupingBy(CourseSchedule::getClassDate));
         if (allCourseSchedules.size() > 1) {
@@ -791,7 +793,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                             if (Objects.nonNull(integerAndIntegerListDto)) {
                                 preCourseSchedule.setTeachingTeacherIdList(integerAndIntegerListDto.getIds());
                             }
-                        } else if (existCourseScheduleIds.contains(preCourseSchedule.getId())) {
+                        } else if (existCourseScheduleIdsSet.contains(preCourseSchedule.getId())) {
                             IntegerAndIntegerListDto integerAndIntegerListDto = courseScheduleTeachingTeacherMap.get(preCourseSchedule.getId());
                             if (Objects.nonNull(integerAndIntegerListDto)) {
                                 preCourseSchedule.setTeachingTeacherIdList(integerAndIntegerListDto.getIds());
@@ -802,7 +804,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                             if (Objects.nonNull(integerAndIntegerListDto)) {
                                 backCourseSchedule.setTeachingTeacherIdList(integerAndIntegerListDto.getIds());
                             }
-                        } else if (existCourseScheduleIds.contains(backCourseSchedule.getId())) {
+                        } else if (existCourseScheduleIdsSet.contains(backCourseSchedule.getId())) {
                             IntegerAndIntegerListDto integerAndIntegerListDto = courseScheduleTeachingTeacherMap.get(backCourseSchedule.getId());
                             if (Objects.nonNull(integerAndIntegerListDto)) {
                                 backCourseSchedule.setTeachingTeacherIdList(integerAndIntegerListDto.getIds());
@@ -834,9 +836,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                                 .map(ClassGroupStudentMapper::getUserId)
                                 .collect(Collectors.toList());
                         //后面一节课程所在班级的学生编号列表
-                        List<Integer> backClassGroupStudentIds = backClassGroupStudents.stream()
+                        Set<Integer> backClassGroupStudentIds = backClassGroupStudents.stream()
                                 .map(ClassGroupStudentMapper::getUserId)
-                                .collect(Collectors.toList());
+                                .collect(Collectors.toSet());
                         List<Integer> repeatStudentIds = preClassGroupStudentIds.stream()
                                 .filter(backClassGroupStudentIds::contains)
                                 .collect(Collectors.toList());