update

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

@@ -297,12 +297,24 @@
         LEFT JOIN class_group cg ON cg.id_ = cgtm.class_group_id_
         LEFT JOIN teacher t ON t.id_ = cgtm.user_id_
         LEFT JOIN course_schedule cs ON (FIND_IN_SET(cs.class_group_id_,cg.id_) AND CONCAT(cs.class_date_,' ',cs.start_class_time_) > NOW())
+        <include refid="queryGroupCoursesSql"/>
+        GROUP BY cgtm.id_
+        <include refid="global.limit"/>
+    </select>
+    <sql id="queryGroupCoursesSql">
         WHERE cgtm.user_id_ = #{search} AND cg.del_flag_ = 0 AND cg.group_type_ = 'MUSIC' AND cs.pre_course_flag_ = 0
         <if test="status != null">
             AND mg.status_ = #{status}
         </if>
-        GROUP BY cgtm.id_
-        <include refid="global.limit"/>
+    </sql>
+    <select id="countGroupCourses" resultType="java.lang.Integer">
+        SELECT COUNT(DISTINCT cgtm.id_)
+        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_
+        LEFT JOIN course_schedule cs ON (FIND_IN_SET(cs.class_group_id_,cg.id_) AND CONCAT(cs.class_date_,' ',cs.start_class_time_) > NOW())
+        <include refid="queryGroupCoursesSql"/>
     </select>
 
 
@@ -781,17 +793,6 @@
         GROUP BY
         vg.id_,cg.id_
     </select>
-    <select id="countGroupCourses" resultType="java.lang.Integer">
-        SELECT COUNT(DISTINCT cgtm.id_)
-        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.group_type_ = 'MUSIC'
-        <if test="status != null">
-            AND mg.status_ = #{status}
-        </if>
-    </select>
     <select id="findStudentOrganIdsByClassGroup" resultType="int">
         SELECT
         DISTINCT su.organ_id_