1、待激活云教练导出文件新增【分部】【获得资格时间】字段

mec-application/src/main/resources/exportColumnMapper.ini

@@ -365,3 +365,7 @@ fieldColumns = ["organName","studentId","studentName","createTime","time","amoun
 [乐团梯队数据导出]
 headColumns = ["乐团","长笛","单簧管","萨克斯","小号","圆号","长号","上低音号","大号","小军鼓","合计"]
 fieldColumns = ["musicGroupName","flute","clarinet","saxophone","trumpet","horn","trombone","euphonium","tuba","snareDrum","total"]
+
+[云教练待激活明细]
+headColumns = ["分部","学员编号","学员姓名","手机号","学员声部","云教练类型","数量","缴费金额（元）","状态","取消原因","操作人","操作时间","获得资格时间"]
+fieldColumns = ["organName","studentId","name","phone","subjectName","type.msg","time","amount","status == 1 ? '待激活':'已取消'","cancelReason","operatorName","operateTime","createTime"]

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

@@ -1923,6 +1923,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		//合并新课程和已存在的课程
 		List<CourseSchedule> allCourseSchedules;
 		if (!CollectionUtils.isEmpty(existCourseSchedules)) {
+			//如果是直播课，那么只校验同一个课程组的课程
+			CourseSchedule courseSchedule = courseSchedules.get(0);
+			if(courseSchedule.getType() == CourseScheduleType.LIVE){
+				existCourseSchedules = existCourseSchedules.stream().
+						filter(e -> e.getMusicGroupId().equals(courseSchedule.getMusicGroupId())).collect(Collectors.toList());
+			}
 			allCourseSchedules = ListUtils.sum(courseSchedules, existCourseSchedules);
 		} else {
 			allCourseSchedules = courseSchedules;