1、课程冲突错误信息优化

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

@@ -711,13 +711,16 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 		String groupId="";
 		CourseSchedule.CourseScheduleType courseType=CourseSchedule.CourseScheduleType.VIP;
+		CourseSchedule courseSchedule=new CourseSchedule();
 		if(Objects.nonNull(preCourseSchedule.getId())&&existCourseScheduleIds.contains(preCourseSchedule.getId())){
 			groupId=preCourseSchedule.getMusicGroupId();
 			courseType=preCourseSchedule.getType();
+            courseSchedule=preCourseSchedule;
 		}
 		if(Objects.nonNull(backCourseSchedule.getId())&&existCourseScheduleIds.contains(backCourseSchedule.getId())){
 			groupId=backCourseSchedule.getMusicGroupId();
 			courseType=preCourseSchedule.getType();
+			courseSchedule=backCourseSchedule;
 		}
 
 		String groupName="";
@@ -735,11 +738,11 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 		errInfo.append(groupName);
 		errInfo.append("(");
-		errInfo.append(preCourseSchedule.getMusicGroupId());
+		errInfo.append(groupId);
 		errInfo.append(")-");
-		errInfo.append(preCourseSchedule.getName());
+		errInfo.append(courseSchedule.getName());
 		errInfo.append("(");
-		errInfo.append(preCourseSchedule.getId());
+		errInfo.append(courseSchedule.getId());
 		errInfo.append(")");
 		errInfo.append("类型为：");
 		switch (type){

mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -1272,6 +1272,7 @@
             CONCAT(cs.class_date_,' ',cs.start_class_time_) start_class_time_,
             CONCAT(cs.class_date_,' ',cs.end_class_time_) end_class_time_,
             cs.type_,
+            cs.name_,
             cs.actual_teacher_id_
         FROM
             course_schedule cs