update

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

@@ -280,6 +280,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			}
 			subSidy = school.getSubsidy();
 		}
+		
+		//查询声部
+		String subjectName = subjectDao.findNames(classGroup.getSubjectIdList());
 
 		// 查询班级老师信息
 		List<ClassGroupTeacherMapper> classGroupTeacherMapperList = classGroupTeacherMapperService.getClassGroupTeachers(classGroupId);
@@ -341,6 +344,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 		// 查询班级学生信息
 		List<ClassGroupStudentMapper> classGroupStudentMapperList = classGroupStudentMapperDao.findByClassGroup(classGroupId);
+		String usernameList = classGroupStudentMapperList.stream().map(ClassGroupStudentMapper::getUserName).collect(Collectors.joining("、"));
 
 		Map<Integer, CourseTimeDto> dayOfWeekMap = teachingArrangementList.stream().collect(Collectors.toMap(CourseTimeDto::getDayOfWeek, ct -> ct));
 
@@ -409,6 +413,11 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 					courseSchedule.setName(classGroup.getName());
 					courseSchedule.setSchoolId(schoolId);
 					courseSchedule.setSubsidy(subSidy);
+					if (type == CourseScheduleType.PRACTICE || type == CourseScheduleType.VIP) {
+						courseSchedule.setName(subjectName + "•" + usernameList);
+					} else {
+						courseSchedule.setName(type.getMsg());
+					}
 					courseScheduleList.add(courseSchedule);
 
 					// 课程与老师薪水表
@@ -508,7 +517,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		
 		//检查冲突
 		checkNewCourseSchedules(courseScheduleList, false);
-        createCourseScheduleName(courseScheduleList);
 
 		if (courseScheduleList.size() > 0) {
 			courseScheduleDao.batchAddCourseSchedules(courseScheduleList);