feat：乐团改造

mec-biz/src/main/java/com/ym/mec/biz/service/CourseScheduleService.java

@@ -625,7 +625,7 @@ public interface CourseScheduleService extends BaseService<Long, CourseSchedule>
 	 * @param courseSchedules:
 	 * @return void
 	 */
-	List<CourseSchedule> mergeCourseReplace(Long classGroupId);
+	List<CourseSchedule> classGroupNotStartMergeCourseReplace(Long classGroupId);
 
 	/**
 	 * @describe 课程合并

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

@@ -454,7 +454,7 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
 
         classGroupService.updateClassStudentNum(classGroupId.intValue(), allStudentIds.size());
 
-        List<CourseSchedule> classGroupNotStartCourse = courseScheduleService.mergeCourseReplace(classGroupId);
+        List<CourseSchedule> classGroupNotStartCourse = courseScheduleService.classGroupNotStartMergeCourseReplace(classGroupId);
         if(CollectionUtils.isEmpty(classGroupNotStartCourse)){
             return;
         }

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

@@ -5258,7 +5258,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 	}
 
 	@Override
-	public List<CourseSchedule> mergeCourseReplace(Long classGroupId) {
+	public List<CourseSchedule> classGroupNotStartMergeCourseReplace(Long classGroupId) {
 		List<CourseSchedule> courseSchedules = courseScheduleDao.getClassGroupCourses(classGroupId);
 		Set<Long> newCourseIds = courseSchedules.stream().filter(c -> Objects.nonNull(c.getNewCourseId())).map(CourseSchedule::getNewCourseId).collect(Collectors.toSet());
 		if(CollectionUtils.isEmpty(newCourseIds)){

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

@@ -1293,7 +1293,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         Map<CourseSchedule.CourseScheduleType, Integer> courseTypeCourseDurationMap = new HashMap<>();
         Map<CourseSchedule.CourseScheduleType, List<CourseSchedule>> typeCourseMap = new HashMap<>();
         if(Objects.nonNull(classGroupId)){
-            List<CourseSchedule> classGroupNotStartCourse = courseScheduleService.mergeCourseReplace(classGroupId);
+            List<CourseSchedule> classGroupNotStartCourse = courseScheduleService.classGroupNotStartMergeCourseReplace(classGroupId);
             typeCourseMap = classGroupNotStartCourse.stream().collect(Collectors.groupingBy(CourseSchedule::getType));
             for (Map.Entry<CourseSchedule.CourseScheduleType, List<CourseSchedule>> typeCoursesEntry : typeCourseMap.entrySet()) {
                 int totalCourseDuration = 0;