update

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

@@ -73,7 +73,7 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
      * @param musicGroupId
      * @return
      */
-    List<ImUserModel> findGroupUsers(String musicGroupId);
+//    List<ImUserModel> findGroupUsers(String musicGroupId);
 
     /**
      * 获取教师所在乐团列表
@@ -88,7 +88,7 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
      * @param musicGroupId
      * @return
      */
-    Set<Integer> queryTeacherIds(String musicGroupId);
+//    Set<Integer> queryTeacherIds(String musicGroupId);
 
     /**
      * 根据乐团编号列表获取乐团在读人数map

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

@@ -271,7 +271,7 @@
         FROM class_group cg
         LEFT JOIN class_group_student_mapper cgsm ON cg.id_ = cgsm.class_group_id_
         LEFT JOIN sys_user su ON cgsm.user_id_ = su.id_
-        WHERE FIND_IN_SET(cg.music_group_id_,#{vipIds}) AND cg.type_ = 'VIP' AND cg.del_flag_ = 0 AND cgsm.status_ != 'QUIT'
+        WHERE FIND_IN_SET(cg.music_group_id_,#{vipIds}) AND cg.group_type_ = 'VIP' AND cg.del_flag_ = 0 AND cgsm.status_ != 'QUIT'
         GROUP BY cg.music_group_id_
     </select>
     <select id="findGroupUsers" resultMap="com.ym.mec.biz.dal.dao.MusicGroupDao.ImUserModel">
@@ -501,14 +501,14 @@
         SELECT cg.name_ class_group_name_,cg.type_ class_group_type_,
         cg.current_class_times_,cg.id_ class_group_id_,cg.total_class_times_
         FROM class_group cg
-        WHERE cg.music_group_id_ = #{search} AND cg.del_flag_ = 0
+        WHERE cg.music_group_id_ = #{search} AND cg.del_flag_ = 0 AND cg.group_type_ = 'MUSIC'
         <include refid="global.limit"/>
     </select>
 
     <select id="countMusicGroupClassGroup" resultType="java.lang.Integer">
         SELECT COUNT(cg.id_)
         FROM class_group cg
-        WHERE cg.music_group_id_ = #{search} AND cg.del_flag_ = 0
+        WHERE cg.music_group_id_ = #{search} AND cg.del_flag_ = 0 AND cg.group_type_ = 'MUSIC'
     </select>
 
     <select id="countStudentNum" resultType="java.util.Map">
@@ -532,7 +532,7 @@
 
     <sql id="queryMusicGroupCourseScheduleSql">
         <where>
-            cg.del_flag_ = 0 AND cgtm.teacher_role_ = 'BISHOP'
+            cg.del_flag_ = 0 AND cgtm.teacher_role_ = 'BISHOP' AND cg.group_type_ = 'MUSIC'
             <if test="classScheduleType != null">
                 AND cs.type_ = #{classScheduleType}
             </if>
@@ -602,7 +602,8 @@
     <select id="queryStudentClassGroup" resultMap="ConditionDto">
         SELECT cg.id_,cg.name_,cg.student_num_ FROM class_group_student_mapper cgsm
         LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_
-        where cg.music_group_id_ = #{musicGroupId} AND cgsm.user_id_ = #{teacherId} AND cg.del_flag_ = 0 AND cgsm.status_ != 'QUIT'
+        where cg.music_group_id_ = #{musicGroupId} AND cgsm.user_id_ = #{teacherId}
+        AND cg.del_flag_ = 0 AND cgsm.status_ != 'QUIT' AND cg.group_type_ = 'MUSIC'
     </select>
 
     <resultMap type="com.ym.mec.biz.dal.dto.CourseListDto" id="CourseListDto">
@@ -631,7 +632,7 @@
         FROM vip_group vg
         LEFT JOIN class_group cg ON cg.music_group_id_ = vg.id_
         LEFT JOIN sys_user su ON vg.user_id_ = su.id_
-        WHERE cg.type_ = 'VIP' AND FIND_IN_SET(vg.id_,#{musicGroupIds}) AND vg.status_!=3
+        WHERE cg.group_type_ = 'VIP' AND FIND_IN_SET(vg.id_,#{musicGroupIds}) AND vg.status_!=3
     </select>
     <select id="queryStudentMusicGroupCourses" resultMap="CourseListDto">
         SELECT mg.id_ music_group_id_,mg.name_ music_group_name_,mgsf.payment_status_,
@@ -641,7 +642,7 @@
         LEFT JOIN class_group cg ON cg.music_group_id_ = mg.id_
         LEFT JOIN music_group_student_fee_ mgsf ON mgsf.music_group_id_ = mg.id_
         LEFT JOIN class_group_student_mapper cgsm ON cgsm.class_group_id_ = cg.id_
-        WHERE FIND_IN_SET(mg.id_,#{musicGroupIds}) AND cg.type_ != 'VIP' AND cg.del_flag_ = 0 AND mgsf.user_id_ =
+        WHERE FIND_IN_SET(mg.id_,#{musicGroupIds}) AND cg.group_type_ = 'MUSIC' AND cg.del_flag_ = 0 AND mgsf.user_id_ =
         #{userId} AND cgsm.user_id_ = #{userId}
         GROUP BY mg.id_,mgsf.payment_status_
     </select>

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

@@ -907,7 +907,7 @@
     </update>
     <update id="updateByMusicGroupId">
         UPDATE course_schedule cs SET cs.schoole_id_ = #{schoolId}
-        WHERE cs.class_group_id_ IN (SELECT cg.id_ FROM class_group cg WHERE cg.music_group_id_ = #{musicGroupId})
+        WHERE cs.class_group_id_ IN (SELECT cg.id_ FROM class_group cg WHERE cg.music_group_id_ = #{musicGroupId} AND cg.group_type_ = 'MUSIC' )
     </update>
 
     <update id="updateCourscheduleStatus">

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

@@ -311,7 +311,9 @@
 	</select>
     
     <select id="queryCurrentMonthCoursesNum" resultType="int">
-    	select count(cs.id_) from course_schedule cs left join demo_group vg on cs.music_group_id_ = vg.id_ AND cs.group_type_='DEMO' where cs.type_ in ('DEMO')
+    	select count(cs.id_) from course_schedule cs
+        left join demo_group vg on cs.music_group_id_ = vg.id_
+        where cs.type_ = 'DEMO'
   		and DATE_FORMAT(cs.class_date_, '%Y%m' ) = DATE_FORMAT(CURDATE() , '%Y%m')
    		<if test="organId != null">
    			and find_in_set(#{organId},vg.organ_id_list_)

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

@@ -284,12 +284,12 @@
 		<result property="name" column="username_"/>
 		<result property="portrait" column="avatar_"/>
 	</resultMap>
-	<select id="findGroupUsers" resultMap="ImUserModel">
+	<!--<select id="findGroupUsers" resultMap="ImUserModel">
 		SELECT su.id_,su.avatar_,su.username_ FROM class_group cg
 		LEFT JOIN class_group_student_mapper cgsm ON cg.id_ = cgsm.class_group_id_
 		LEFT JOIN sys_user su ON cgsm.user_id_ = su.id_
 		WHERE cg.music_group_id_ = #{musicGroupId}  AND cgsm.status_ != 'QUIT' GROUP BY su.id_
-	</select>
+	</select>-->
 	<select id="queryTeacherGroups" resultMap="com.ym.mec.biz.dal.dao.ClassGroupDao.imGroupModel">
 		SELECT mg.id_,mg.name_,mg.img_,GROUP_CONCAT(DISTINCT cgtm.user_id_) teacher_ids_
 		FROM music_group mg
@@ -303,16 +303,18 @@
 		GROUP BY mg.id_
 	</select>
 
-	<select id="queryTeacherIds" resultType="java.lang.Integer">
+	<!--<select id="queryTeacherIds" resultType="java.lang.Integer">
 		SELECT DISTINCT cgtm.user_id_ FROM class_group cg
 		LEFT JOIN class_group_teacher_mapper cgtm ON cg.id_ = cgtm.class_group_id_
 		WHERE cg.music_group_id_ = #{musicGroupId}
-	</select>
+	</select>-->
+
     <select id="countPayNum" resultType="java.util.Map" parameterType="list">
 		SELECT cg.music_group_id_ `key`,COUNT(cgsm.id_) `value` FROM class_group cg
 		LEFT JOIN class_group_student_mapper cgsm ON cg.id_ = cgsm.class_group_id_
 		WHERE FIND_IN_SET(cg.music_group_id_,#{musicGroupIds})
-		AND cgsm.status_ != 'QUIT' AND cg.type_ != 'MIX' GROUP BY cg.music_group_id_
+		AND cgsm.status_ != 'QUIT' AND cg.type_ != 'MIX' AND cg.group_type_ = 'MUSIC'
+		GROUP BY cg.music_group_id_
 	</select>
 
     <select id="queryListByIds" resultMap="MusicGroup" parameterType="list">
@@ -341,7 +343,10 @@
   	</select>
   	
   	<select id="queryCurrentMonthCoursesNum" resultType="int">
-  		select count(cs.id_) from course_schedule cs left join class_group cg on cs.class_group_id_ = cg.id_ left join music_group mg on cg.music_group_id_ = mg.id_ where cs.type_ not in ('VIP','DEMO')
+  		SELECT count(cs.id_) from course_schedule cs
+		left join class_group cg on cs.class_group_id_ = cg.id_
+		left join music_group mg on cg.music_group_id_ = mg.id_
+		where cs.group_type_ = 'MUSIC' AND cg.group_type_ = 'MUSIC'
   		and DATE_FORMAT(cs.class_date_, '%Y%m' ) = DATE_FORMAT(CURDATE() , '%Y%m')
    		<if test="organId != null">
    			and mg.organ_id_ = #{organId}

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

@@ -143,17 +143,18 @@
 
     <sql id="queryCondition">
         <where>
+                cg.group_type_ = 'MUSIC'
             <if test="createTime != null">
-                DATE_FORMAT(ch.create_time_,"%Y%m%d") = DATE_FORMAT(#{createTime},"%Y%m%d")
+                AND DATE_FORMAT(ch.create_time_,"%Y%m%d") = DATE_FORMAT(#{createTime},"%Y%m%d")
             </if>
             <if test="musicGroupId != null">
-                and cg.music_group_id_ = #{musicGroupId}
+                AND cg.music_group_id_ = #{musicGroupId}
             </if>
             <if test="classGroupId != null">
-                and ch.class_group_id_ = #{classGroupId}
+                AND ch.class_group_id_ = #{classGroupId}
             </if>
             <if test="userId != null">
-                and sch.user_id_ = #{userId}
+                AND sch.user_id_ = #{userId}
             </if>
         </where>
     </sql>

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

@@ -118,7 +118,7 @@
         LEFT JOIN sys_user su ON su.id_ = cs.actual_teacher_id_
         LEFT JOIN class_group_student_mapper cgsm ON cgsm.music_group_id_ = vg.id_
         <where>
-            vg.audit_status_ = 'PASS' AND cs.id_ IS NOT NULL AND cgsm.status_ != 'QUIT'
+            vg.audit_status_ = 'PASS' AND cs.id_ IS NOT NULL AND cgsm.status_ != 'QUIT' AND cg.group_type_ = 'VIP'
             <if test="studentId != null">
                 AND cgsm.user_id_ = #{studentId}
             </if>
@@ -137,7 +137,7 @@
         LEFT JOIN course_schedule cs ON cs.music_group_id_ = vg.id_
         LEFT JOIN class_group_student_mapper cgsm ON cgsm.music_group_id_ = vg.id_
         <where>
-            vg.audit_status_ = 'PASS' AND cs.id_ IS NOT NULL AND cgsm.status_ != 'QUIT'
+            vg.audit_status_ = 'PASS' AND cs.id_ IS NOT NULL AND cgsm.status_ != 'QUIT' AND cg.group_type_ = 'VIP'
             <if test="studentId != null">
                 AND cgsm.user_id_ = #{studentId}
             </if>

mec-education/src/main/resources/mapper/ClassGroupStudentMapperMapper.xml

@@ -22,7 +22,8 @@
     <select id="selectStudentPage" parameterType="com.ym.mec.education.req.ClassGroupReq"
             resultType="com.ym.mec.education.resp.ClassStudentResp">
 
-        SELECT s.real_name_ as name,s.avatar_ as avatar,m.class_group_id_ as classGroupId,s.id_ as userId,c.music_group_id_ as musicGroupId  from class_group_student_mapper m
+        SELECT s.real_name_ as name,s.avatar_ as avatar,m.class_group_id_ as classGroupId,s.id_ as userId,c.music_group_id_ as musicGroupId
+        from class_group_student_mapper m
 
         LEFT JOIN class_group c on m.class_group_id_ = c.id_