Merge remote-tracking branch 'origin/master'

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

@@ -136,13 +136,13 @@
 
     <select id="queryTeacherCourseGroups" resultMap="CoursesGroup">
 		SELECT * FROM courses_group
-		WHERE teacher_id_=#{userId} AND status_ IN ('APPLYING', 'NORMAL')
+		WHERE teacher_id_=#{userId} AND status_ IN ('NOT_START', 'NORMAL', 'FINISH')
 		ORDER BY id_ DESC
 		<include refid="global.limit"/>
     </select>
     <select id="countTeacherCourseGroups" resultType="int">
 		SELECT COUNT(0) FROM courses_group
-		WHERE teacher_id_ = #{userId} AND status_ IN ('APPLYING', 'NORMAL')
+		WHERE teacher_id_ = #{userId} AND status_ IN ('NOT_START', 'NORMAL', 'FINISH')
     </select>
     <select id="findFreezeMinutes" resultType="java.util.Map">
 		SELECT COUNT(DISTINCT cs.id_) * cg.single_class_minutes_ 'value',cg.id_ 'key' FROM courses_group cg

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

@@ -1008,5 +1008,35 @@
         LEFT JOIN class_group_teacher_mapper cgtm ON pg.id_ = cgtm.music_group_id_
         WHERE pg.educational_teacher_id_ = #{teacherId} AND cgtm.group_type_ = 'PRACTICE'
         GROUP BY cgtm.user_id_
+        UNION ALL
+        SELECT vg.educational_teacher_id_ FROM class_group_teacher_mapper cgtm
+        LEFT JOIN vip_group vg ON vg.id_ = cgtm.music_group_id_
+        WHERE cgtm.user_id_ = #{teacherId} AND cgtm.group_type_ = 'VIP'
+        GROUP BY vg.educational_teacher_id_
+        UNION ALL
+        SELECT cg.educational_teacher_id_ FROM class_group_teacher_mapper cgtm
+        LEFT JOIN courses_group cg ON cg.id_ = cgtm.music_group_id_
+        WHERE cgtm.user_id_ = #{teacherId} AND cgtm.group_type_ = 'COMM'
+        GROUP BY cg.educational_teacher_id_
+        UNION ALL
+        SELECT pg.educational_teacher_id_ FROM class_group_teacher_mapper cgtm
+        LEFT JOIN practice_group pg ON pg.id_ = cgtm.music_group_id_
+        WHERE cgtm.user_id_ = #{teacherId} AND cgtm.group_type_ = 'PRACTICE'
+        GROUP BY pg.educational_teacher_id_
+        UNION ALL
+        SELECT vg.educational_teacher_id_ FROM course_schedule_teacher_salary csts
+        LEFT JOIN vip_group vg ON vg.id_ = csts.music_group_id_
+        WHERE csts.user_id_ = #{teacherId} AND csts.group_type_ = 'VIP'
+        GROUP BY vg.educational_teacher_id_
+        UNION ALL
+        SELECT cg.educational_teacher_id_ FROM course_schedule_teacher_salary csts
+        LEFT JOIN courses_group cg ON cg.id_ = csts.music_group_id_
+        WHERE csts.user_id_ = #{teacherId} AND csts.group_type_ = 'COMM'
+        GROUP BY cg.educational_teacher_id_
+        UNION ALL
+        SELECT pg.educational_teacher_id_ FROM course_schedule_teacher_salary csts
+        LEFT JOIN practice_group pg ON pg.id_ = csts.music_group_id_
+        WHERE csts.user_id_ = #{teacherId} AND csts.group_type_ = 'PRACTICE'
+        GROUP BY pg.educational_teacher_id_
     </select>
 </mapper>