feat:教务端学员云教练数据统计

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

@@ -1683,9 +1683,11 @@
 				sr.user_id_
 			FROM
 				student_registration sr
+				LEFT JOIN music_group mg ON sr.music_group_id_=mg.id_
 				LEFT JOIN sys_user su ON sr.user_id_ = su.id_
 			WHERE
 				su.del_flag_ = 0
+				AND mg.status_='PROGRESS'
 				AND sr.music_group_status_ = 'NORMAL'
 				<if test="dayStr!=null and dayStr!=''">
 					AND DATE(sr.create_time_)&lt;= #{dayStr}

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

@@ -779,8 +779,10 @@
         SELECT COUNT(DISTINCT user_id_)
         FROM ((SELECT sr.user_id_
                FROM student_registration sr
+                        LEFT JOIN music_group mg ON sr.music_group_id_=mg.id_
                         LEFT JOIN sys_user su ON sr.user_id_=su.id_
                WHERE su.del_flag_=0
+                 AND mg.status_='PROGRESS'
                  AND sr.music_group_status_='NORMAL'
                  AND su.organ_id_ = #{organId})
               UNION ALL
@@ -801,8 +803,10 @@
         SELECT COUNT(DISTINCT user_id_)
         FROM ((SELECT sr.user_id_
                FROM student_registration sr
+                    LEFT JOIN music_group mg ON sr.music_group_id_=mg.id_
                         LEFT JOIN sys_user su ON sr.user_id_=su.id_
                WHERE su.del_flag_=0
+                AND mg.status_='PROGRESS'
                  AND sr.music_group_status_='NORMAL'
                 <if test="organIds!=null and organIds.size()>0">
                     AND su.organ_id_ IN
@@ -833,8 +837,10 @@
         SELECT t.organ_id_ 'key',COUNT(DISTINCT user_id_) 'value'
         FROM ((SELECT su.organ_id_,sr.user_id_
         FROM student_registration sr
+        LEFT JOIN music_group mg ON sr.music_group_id_=mg.id_
         LEFT JOIN sys_user su ON sr.user_id_=su.id_
         WHERE su.del_flag_=0
+        AND mg.status_='PROGRESS'
         AND sr.music_group_status_='NORMAL')
         UNION ALL
         (SELECT
@@ -861,7 +867,8 @@
         SELECT stu.teacher_id_ 'key',COUNT(DISTINCT t.user_id_) 'value'
         FROM ((SELECT sr.user_id_
         FROM student_registration sr
-        WHERE sr.music_group_status_='NORMAL')
+        LEFT JOIN music_group mg ON sr.music_group_id_=mg.id_
+        WHERE mg.status_='PROGRESS' AND sr.music_group_status_='NORMAL')
         UNION ALL
         (SELECT
         cssp.user_id_