浏览代码

feat:无班级学员异常提醒

Joburgess 4 年之前
父节点
当前提交
5ef3f43f52

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

@@ -847,7 +847,7 @@
 		FROM
 			student_registration sr
 				LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
-				LEFT JOIN class_group_student_mapper cgsm ON cgsm.group_type_='MUSIC' AND cgsm.music_group_id_=sr.music_group_id_ AND cgsm.user_id_=sr.user_id_
+				LEFT JOIN class_group_student_mapper cgsm ON cgsm.group_type_='MUSIC' AND cgsm.music_group_id_=sr.music_group_id_ AND cgsm.user_id_=sr.user_id_ AND cgsm.status_='NORMAL'
 		WHERE
 			sr.music_group_status_ = 'NORMAL'
 			AND mg.status_ = 'PROGRESS'

+ 2 - 0
mec-biz/src/main/resources/config/mybatis/StudentRegistrationMapper.xml

@@ -888,6 +888,7 @@
             LEFT JOIN class_group_student_mapper cgsm ON cgsm.group_type_ = 'MUSIC'
                 AND cgsm.music_group_id_ = sr.music_group_id_
                 AND cgsm.user_id_ = sr.user_id_
+                AND cgsm.status_='NORMAL'
             LEFT JOIN sys_user stu ON stu.id_ = sr.user_id_
             LEFT JOIN organization organ ON mg.organ_id_=organ.id_
             LEFT JOIN `subject` sub ON sub.id_=sr.actual_subject_id_
@@ -905,6 +906,7 @@
             LEFT JOIN class_group_student_mapper cgsm ON cgsm.group_type_ = 'MUSIC'
                 AND cgsm.music_group_id_ = sr.music_group_id_
                 AND cgsm.user_id_ = sr.user_id_
+                AND cgsm.status_='NORMAL'
             LEFT JOIN sys_user stu ON stu.id_ = sr.user_id_
         <include refid="queryNoClassMusicStudentsCondition" />
     </select>