update

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

@@ -27,6 +27,9 @@ public class TeacherMusicClassInfoDto {
     @ApiModelProperty(value = "运营主管编号", required = false)
     private Integer teamTeacherId;
 
+    @ApiModelProperty(value = "教师角色", required = false)
+    private String teacherRole;
+
     @ApiModelProperty(value = "执教班级名称", required = false)
     private List<String> classGroupNames;
 
@@ -39,6 +42,14 @@ public class TeacherMusicClassInfoDto {
     @ApiModelProperty(value = "出勤次数",required = false)
     private Integer attendanceNum;
 
+    public String getTeacherRole() {
+        return teacherRole;
+    }
+
+    public void setTeacherRole(String teacherRole) {
+        this.teacherRole = teacherRole;
+    }
+
     public Integer getAttendanceNum() {
         return attendanceNum;
     }

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

@@ -202,6 +202,7 @@
         <result column="music_group_name_" property="musicGroupName"/>
         <result column="educational_teacher_id_" property="educationalTeacherId"/>
         <result column="team_teacher_id_" property="teamTeacherId"/>
+        <result column="teacher_role_" property="teacherRole"/>
         <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="job_type_" property="jobType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="job_nature_" property="jobNature" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
@@ -211,12 +212,13 @@
     </resultMap>
     <select id="queryGroupCourses" resultMap="getTeaCourseInfosMap">
         SELECT mg.id_ music_group_id_,mg.name_ music_group_name_,
-        mg.team_teacher_id_,mg.educational_teacher_id_,cg.name_ class_group_name_,mg.status_,t.job_type_,t.job_nature_
+        mg.team_teacher_id_,mg.educational_teacher_id_,cg.name_ class_group_name_,
+        mg.status_,t.job_type_,t.job_nature_,cgtm.teacher_role_
         FROM class_group_teacher_mapper cgtm
         LEFT JOIN music_group mg ON cgtm.music_group_id_ = mg.id_
         LEFT JOIN class_group cg ON cg.id_ = cgtm.class_group_id_
         LEFT JOIN teacher t ON t.id_ = cgtm.user_id_
-        WHERE cgtm.user_id_ = #{search} AND cg.del_flag_ = 0 AND (cg.type_ = 'NORMAL' OR cg.type_ = 'MIX')
+        WHERE cgtm.user_id_ = #{search} AND cg.del_flag_ = 0 AND cg.group_type_ = 'MUSIC'
         <include refid="global.limit"/>
     </select>
 
@@ -471,7 +473,7 @@
         LEFT JOIN music_group mg ON cgtm.music_group_id_ = mg.id_
         LEFT JOIN class_group cg ON cg.id_ = cgtm.class_group_id_
         LEFT JOIN teacher t ON t.id_ = cgtm.user_id_
-        WHERE cgtm.user_id_ = #{search} AND cg.del_flag_ = 0 AND (cg.type_ = 'NORMAL' OR cg.type_ = 'MIX')
+        WHERE cgtm.user_id_ = #{search} AND cg.del_flag_ = 0 AND cg.group_type_ = 'MUSIC'
     </select>
     <select id="findStudentOrganIdsByClassGroup" resultType="int">
         SELECT