|
|
@@ -264,11 +264,11 @@
|
|
|
COUNT(CASE WHEN mcr.feature_ = 'CLOUD_STUDY_EVALUATION' THEN mcr.behavior_id_ ELSE NULL END) record_num_,GROUP_CONCAT(DISTINCT mg.name_) music_group_name_
|
|
|
FROM teacher t
|
|
|
LEFT JOIN student s ON t.id_ = s.teacher_id_
|
|
|
- LEFT JOIN student_registration sr ON sr.user_id_ = s.user_id_
|
|
|
- LEFT JOIN music_group mg ON mg.id_ = sr.music_group_id_
|
|
|
+ LEFT JOIN student_registration sr ON sr.user_id_ = s.user_id_ AND sr.music_group_status_ = 'NORMAL'
|
|
|
+ LEFT JOIN music_group mg ON mg.id_ = sr.music_group_id_ AND mg.status_ = 'PROGRESS'
|
|
|
LEFT JOIN sys_user su ON su.id_ = s.user_id_
|
|
|
LEFT JOIN sys_music_compare_record mcr ON mcr.user_id_ = s.user_id_
|
|
|
- WHERE s.teacher_id_ = #{teacherId} AND sr.music_group_status_ = 'NORMAL' AND mg.status_ = 'PROGRESS'
|
|
|
+ WHERE s.teacher_id_ = #{teacherId}
|
|
|
<if test="startTime != null and startTime != ''">
|
|
|
AND (mcr.create_time_ BETWEEN #{startTime} AND #{endTime} OR mcr.id_ IS NULL)
|
|
|
</if>
|
zouxuan