Merge branch 'online1' into music_score

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

@@ -1708,6 +1708,7 @@
 				<if test="dayStr!=null and dayStr!=''">
 					AND DATE(cssp.create_time_)&lt;= #{dayStr}
 				</if>)) t
+		WHERE t.user_id_ NOT IN (SELECT user_id_ FROM student WHERE subject_id_list_ REGEXP '21|25|26|27|28|29')
 		GROUP BY t.organ_id_
 	</select>
 

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

@@ -797,6 +797,7 @@
                  AND cs.status_='NOT_START'
                  AND su.del_flag_ = 0
                  AND su.organ_id_ = #{organId})) t
+        WHERE t.user_id_ NOT IN (SELECT user_id_ FROM student WHERE subject_id_list_ REGEXP '21|25|26|27|28|29')
     </select>
 
     <select id="getOrgansTotalStudentNum" resultType="int">
@@ -843,7 +844,7 @@
         cssp.group_type_ IN ('VIP', 'PRACTICE')
         AND cs.status_='NOT_START')) t
         LEFT JOIN sys_user su ON t.user_id_=su.id_
-        WHERE su.del_flag_=0
+        WHERE su.del_flag_=0 AND t.user_id_ NOT IN (SELECT user_id_ FROM student WHERE subject_id_list_ REGEXP '21|25|26|27|28|29')
 <!--        <if test="organIds!=null and organIds.size()>0">-->
 <!--            AND su.organ_id_ IN-->
 <!--            <foreach collection="organIds" item="organId" open="(" close=")" separator=",">-->
@@ -1026,7 +1027,7 @@
 
     <sql id="queryCloudStudyStudentDataCondition">
         <where>
-            su.del_flag_=0
+            su.del_flag_=0 AND t.user_id_ NOT IN (SELECT user_id_ FROM student WHERE subject_id_list_ REGEXP '21|25|26|27|28|29')
             <if test="organId!=null">
                 AND su.organ_id_=#{organId}
             </if>