修改乐团老师设置

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ClassGroupDao.java

@@ -101,7 +101,7 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @param musicGroupId
      * @return
      */
-    List<ClassGroupTeachersDto> findClassGroupByMusicGroupId(@Param("musicGroupId") String musicGroupId);
+    List<ClassGroupTeachersDto> findClassGroupByMusicGroupId(@Param("musicGroupId") String musicGroupId, @Param("type") String type);
 
     /**
      * 获取学生所购买课程列表
@@ -179,6 +179,7 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
 
     /**
      * 获取当前班级老师id列表
+     *
      * @param id
      * @return
      */
@@ -186,6 +187,7 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
 
     /**
      * 获取老师所在班级群组列表
+     *
      * @param userId
      * @param search
      * @return
@@ -194,6 +196,7 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
 
     /**
      * 获取未分配合奏的单技班列表
+     *
      * @param musicGroupId
      * @return
      */

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

@@ -257,7 +257,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
     @Override
     public List<ClassGroupTeachersDto> getClassGroupAndTeachers(String musicGroupId) {
-        List<ClassGroupTeachersDto> classGroupAndTeachersList = classGroupDao.findClassGroupByMusicGroupId(musicGroupId);
+        List<ClassGroupTeachersDto> classGroupAndTeachersList = classGroupDao.findClassGroupByMusicGroupId(musicGroupId,"NORMAL,MIX");
 
         List<ClassGroupTeacherMapper> classGroupTeacherMapperList = classGroupTeacherMapperService.findClassGroupTeachers(classGroupAndTeachersList);
 

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

@@ -172,7 +172,8 @@
     <!-- 根据乐团id获取单技班信息 -->
     <select id="findAllNormalClassGroupByMusicGroupId" resultMap="ClassGroup">
         SELECT
-        cg.*, (SELECT group_concat(sb.name_) FROM subject sb WHERE FIND_IN_SET(sb.id_,cg.subject_id_list_)) AS subject_name_
+        cg.*, (SELECT group_concat(sb.name_) FROM subject sb WHERE FIND_IN_SET(sb.id_,cg.subject_id_list_)) AS
+        subject_name_
         FROM
         class_group cg
         WHERE cg.music_group_id_=#{musicGroupId} AND cg.type_='NORMAL' AND cg.del_flag_='0'
@@ -259,7 +260,11 @@
     </resultMap>
     <!-- 根据乐团id获取乐团下所有班级 -->
     <select id="findClassGroupByMusicGroupId" resultMap="ClassGroupTeachers">
-        SELECT * FROM class_group WHERE music_group_id_ = #{musicGroupId} AND AND del_flag_ = 0;
+        SELECT * FROM class_group WHERE music_group_id_ = #{musicGroupId}
+        <if test="type !=null and type !=''">
+        AND FIND_IN_SET(type_,#{type})
+        </if>
+        AND del_flag_ = 0;
     </select>
 
     <resultMap type="com.ym.mec.biz.dal.dto.CourseListDto" id="CourseListDto">
@@ -274,26 +279,28 @@
     </resultMap>
     <select id="queryCoursePage" resultMap="CourseListDto">
         SELECT * FROM (
-            SELECT cg.type_,s.address_,mg.name_ music_group_name_,
-            cg.total_class_times_,cg.current_class_times_,'' single_class_minutes_,mg.id_ music_group_id_,cg.create_time_,cs.teach_mode_
-            FROM student_registration sr
-            LEFT JOIN class_group cg ON cg.id_ = sr.class_group_id_
-            LEFT JOIN course_schedule cs ON cs.class_group_id_ = cg.id_
-            LEFT JOIN music_group mg ON cg.music_group_id_ = mg.id_
-            LEFT JOIN school s ON mg.school_id_ = s.id_
-            WHERE sr.user_id_ = #{search} AND cg.type_ != 'VIP'
-            UNION ALL
-            SELECT cg.type_,ts.address_,vg.name_ music_group_name_,
-            cg.total_class_times_,cg.current_class_times_,vg.single_class_minutes_,vg.id_ music_group_id_,cg.create_time_,cs.teach_mode_
-            FROM class_group_student_mapper cgsm
-            LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_
-            LEFT JOIN course_schedule cs ON cs.class_group_id_ = cg.id_
-            LEFT JOIN vip_group_class_group_mapper vgcgm ON vgcgm.class_group_id_ = cgsm.class_group_id_
-            LEFT JOIN vip_group vg ON vg.id_ = vgcgm.vip_group_id_
-            LEFT JOIN teacher_school ts ON vg.teacher_school_id_ = ts.id_
-            WHERE cgsm.user_id_ = #{search} AND cg.type_ = 'VIP') a
-            ORDER BY a.create_time_ DESC
-            <include refid="global.limit"/>
+        SELECT cg.type_,s.address_,mg.name_ music_group_name_,
+        cg.total_class_times_,cg.current_class_times_,'' single_class_minutes_,mg.id_
+        music_group_id_,cg.create_time_,cs.teach_mode_
+        FROM student_registration sr
+        LEFT JOIN class_group cg ON cg.id_ = sr.class_group_id_
+        LEFT JOIN course_schedule cs ON cs.class_group_id_ = cg.id_
+        LEFT JOIN music_group mg ON cg.music_group_id_ = mg.id_
+        LEFT JOIN school s ON mg.school_id_ = s.id_
+        WHERE sr.user_id_ = #{search} AND cg.type_ != 'VIP'
+        UNION ALL
+        SELECT cg.type_,ts.address_,vg.name_ music_group_name_,
+        cg.total_class_times_,cg.current_class_times_,vg.single_class_minutes_,vg.id_
+        music_group_id_,cg.create_time_,cs.teach_mode_
+        FROM class_group_student_mapper cgsm
+        LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_
+        LEFT JOIN course_schedule cs ON cs.class_group_id_ = cg.id_
+        LEFT JOIN vip_group_class_group_mapper vgcgm ON vgcgm.class_group_id_ = cgsm.class_group_id_
+        LEFT JOIN vip_group vg ON vg.id_ = vgcgm.vip_group_id_
+        LEFT JOIN teacher_school ts ON vg.teacher_school_id_ = ts.id_
+        WHERE cgsm.user_id_ = #{search} AND cg.type_ = 'VIP') a
+        ORDER BY a.create_time_ DESC
+        <include refid="global.limit"/>
     </select>
 
     <resultMap id="imGroupModel" type="com.ym.mec.common.entity.ImGroupModel">
@@ -372,22 +379,24 @@
     </select>
     <select id="countCoursePage" resultType="java.lang.Integer">
         SELECT COUNT(id_) FROM (
-            SELECT cg.type_,s.address_,mg.name_ music_group_name_,
-            cg.total_class_times_,cg.current_class_times_,'' single_class_minutes_,mg.id_ music_group_id_,cg.create_time_,cg.id_
-            FROM student_registration sr
-            LEFT JOIN class_group cg ON cg.id_ = sr.class_group_id_
-            LEFT JOIN music_group mg ON cg.music_group_id_ = mg.id_
-            LEFT JOIN school s ON mg.school_id_ = s.id_
-            WHERE sr.user_id_ = #{search} AND cg.type_ != 'VIP'
-            UNION ALL
-            SELECT cg.type_,ts.address_,vg.name_ music_group_name_,
-            cg.total_class_times_,cg.current_class_times_,vg.single_class_minutes_,vg.id_ music_group_id_,cg.create_time_,cg.id_
-            FROM class_group_student_mapper cgsm
-            LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_
-            LEFT JOIN vip_group_class_group_mapper vgcgm ON vgcgm.class_group_id_ = cgsm.class_group_id_
-            LEFT JOIN vip_group vg ON vg.id_ = vgcgm.vip_group_id_
-            LEFT JOIN teacher_school ts ON vg.teacher_school_id_ = ts.id_
-            WHERE cgsm.user_id_ = #{search} AND cg.type_ = 'VIP') a
+        SELECT cg.type_,s.address_,mg.name_ music_group_name_,
+        cg.total_class_times_,cg.current_class_times_,'' single_class_minutes_,mg.id_
+        music_group_id_,cg.create_time_,cg.id_
+        FROM student_registration sr
+        LEFT JOIN class_group cg ON cg.id_ = sr.class_group_id_
+        LEFT JOIN music_group mg ON cg.music_group_id_ = mg.id_
+        LEFT JOIN school s ON mg.school_id_ = s.id_
+        WHERE sr.user_id_ = #{search} AND cg.type_ != 'VIP'
+        UNION ALL
+        SELECT cg.type_,ts.address_,vg.name_ music_group_name_,
+        cg.total_class_times_,cg.current_class_times_,vg.single_class_minutes_,vg.id_
+        music_group_id_,cg.create_time_,cg.id_
+        FROM class_group_student_mapper cgsm
+        LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_
+        LEFT JOIN vip_group_class_group_mapper vgcgm ON vgcgm.class_group_id_ = cgsm.class_group_id_
+        LEFT JOIN vip_group vg ON vg.id_ = vgcgm.vip_group_id_
+        LEFT JOIN teacher_school ts ON vg.teacher_school_id_ = ts.id_
+        WHERE cgsm.user_id_ = #{search} AND cg.type_ = 'VIP') a
     </select>
 
     <select id="countClassStudent" resultType="int">
@@ -422,6 +431,7 @@
 
     <!-- 增加实际学生人数 -->
     <update id="addStudentNum" parameterType="com.ym.mec.biz.dal.entity.ClassGroup">
-        UPDATE class_group SET student_num_ = student_num_+1,update_time_=#{updateTime} WHERE id_ = #{id} AND student_num_=#{studentNum}
+        UPDATE class_group SET student_num_ = student_num_+1,update_time_=#{updateTime} WHERE id_ = #{id} AND
+        student_num_=#{studentNum}
     </update>
 </mapper>