1、课表organ_id_字段初始化;

2、课表列表去除团体名和班级名，搜索更改为按团体编号/课程编号/课程名搜索
3、修复对外课程无部门编号
4、节假日获取方式调整
5、线上乐团课创建
6、服务指标添加教务老师编号

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentEduTeacherDto.java

@@ -1,5 +1,7 @@
 package com.ym.mec.biz.dal.dto;
 
+import com.ym.mec.biz.dal.enums.GroupType;
+
 public class StudentEduTeacherDto {
 
     private Integer studentId;
@@ -8,6 +10,16 @@ public class StudentEduTeacherDto {
 
     private String educationalTeacherName;
 
+    private String groupType;
+
+    public String getGroupType() {
+        return groupType;
+    }
+
+    public void setGroupType(String groupType) {
+        this.groupType = groupType;
+    }
+
     public Integer getStudentId() {
         return studentId;
     }

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

@@ -14,6 +14,7 @@ import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -76,8 +77,26 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
 				exercisesSituationDto.setExpectExercisesNum((int) until+1);
 				List<StudentEduTeacherDto> studentEduTeachers = studentEduTeachersMap.get(exercisesSituationDto.getStudentId());
 				if(!CollectionUtils.isEmpty(studentEduTeachers)){
-					exercisesSituationDto.setEducationalTeacherId(studentEduTeachers.get(0).getEducationalTeacherId());
-					exercisesSituationDto.setEducationalTeacherName(studentEduTeachers.get(0).getEducationalTeacherName());
+					List<StudentEduTeacherDto> t1 = studentEduTeachers.stream().filter(set -> set.getGroupType().equals(GroupType.VIP.getCode())||set.getGroupType().equals(GroupType.PRACTICE.getCode())).collect(Collectors.toList());
+					if(CollectionUtils.isEmpty(t1)){
+						for (StudentEduTeacherDto studentEduTeacherDto : t1) {
+							if(StringUtils.isNoneBlank(studentEduTeacherDto.getEducationalTeacherName())){
+								exercisesSituationDto.setEducationalTeacherId(studentEduTeachers.get(0).getEducationalTeacherId());
+								exercisesSituationDto.setEducationalTeacherName(studentEduTeachers.get(0).getEducationalTeacherName());
+								break;
+							}
+						}
+					}
+					List<StudentEduTeacherDto> t2 = studentEduTeachers.stream().filter(set -> set.getGroupType().equals(GroupType.MUSIC.getCode())).collect(Collectors.toList());
+					if(CollectionUtils.isEmpty(t2)){
+						for (StudentEduTeacherDto studentEduTeacherDto : t2) {
+							if(StringUtils.isNoneBlank(studentEduTeacherDto.getEducationalTeacherName())){
+								exercisesSituationDto.setEducationalTeacherId(studentEduTeachers.get(0).getEducationalTeacherId());
+								exercisesSituationDto.setEducationalTeacherName(studentEduTeachers.get(0).getEducationalTeacherName());
+								break;
+							}
+						}
+					}
 				}
 			}
 		}

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

@@ -458,12 +458,14 @@
         SELECT
         t.user_id_ studentId,
         t.educational_teacher_id_ educationalTeacherId,
-        su.real_name_ educationalTeacherName
+        su.real_name_ educationalTeacherName,
+        t.group_type_ groupType
         FROM
         (
         SELECT
         mgsf.user_id_,
-        g.educational_teacher_id_
+        g.educational_teacher_id_,
+        'MUSIC' group_type_
         FROM
         music_group_student_fee_ mgsf
         LEFT JOIN music_group g ON mgsf.music_group_id_ = g.id_
@@ -475,7 +477,8 @@
         UNION ALL
         SELECT
         cgsm.user_id_,
-        g.educational_teacher_id_
+        g.educational_teacher_id_,
+        'VIP' group_type_
         FROM
         class_group_student_mapper cgsm
         LEFT JOIN vip_group g ON cgsm.music_group_id_ = g.id_
@@ -488,7 +491,8 @@
         UNION ALL
         SELECT
         cgsm.user_id_,
-        g.educational_teacher_id_
+        g.educational_teacher_id_,
+        'PRACTICE' group_type_
         FROM
         class_group_student_mapper cgsm
         LEFT JOIN practice_group g ON cgsm.music_group_id_ = g.id_