|
@@ -1152,11 +1152,13 @@
|
|
|
FROM
|
|
FROM
|
|
|
student_registration sr
|
|
student_registration sr
|
|
|
LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
|
|
LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
|
|
|
|
|
+ LEFT JOIN `subject` sub ON sr.actual_subject_id_=sub.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'
|
|
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
|
|
WHERE
|
|
|
sr.music_group_status_ = 'NORMAL'
|
|
sr.music_group_status_ = 'NORMAL'
|
|
|
AND mg.status_ = 'PROGRESS'
|
|
AND mg.status_ = 'PROGRESS'
|
|
|
AND cgsm.id_ IS NULL
|
|
AND cgsm.id_ IS NULL
|
|
|
|
|
+ AND sub.parent_subject_id_!=24
|
|
|
<if test="educationUserId != null">
|
|
<if test="educationUserId != null">
|
|
|
AND mg.educational_teacher_id_ = #{educationUserId}
|
|
AND mg.educational_teacher_id_ = #{educationUserId}
|
|
|
</if>
|
|
</if>
|
Joburgess