|
|
@@ -927,28 +927,28 @@
|
|
|
select sees.student_id_,sees.music_group_id_,sees.monday_,sees.sunday_,sum(sees.expect_exercises_num_) serve_total_num_,
|
|
|
sum(sees.actual_exercises_num_) actual_exercises_num_,SUM(sees.exercises_reply_num_) exercises_reply_num_,sum(sees.exercises_message_num_) exercises_message_num_,
|
|
|
GROUP_CONCAT(DISTINCT CASE WHEN sees.exercises_reply_num_ < sees.actual_exercises_num_ THEN sees.monday_ END) not_homework_date_
|
|
|
- from student_extracurricular_exercises_situation_ sees
|
|
|
- where sees.monday_ >= #{monday} AND sees.sunday_ <= #{sunday}
|
|
|
- group by sees.student_id_,sees.music_group_id_) sees
|
|
|
+ FROM student_extracurricular_exercises_situation_ sees
|
|
|
+ WHERE sees.monday_ >= #{monday} AND sees.sunday_ <= #{sunday}
|
|
|
+ GROUP BY sees.student_id_,sees.music_group_id_) sees
|
|
|
LEFT JOIN (
|
|
|
- select sees.student_id_,sbi.organ_id_,sees.music_group_id_,sbi.user_name_,mg.name_ music_group_name_,sbi.organ_name_,
|
|
|
+ SELECT sees.student_id_,sbi.organ_id_,sees.music_group_id_,sbi.user_name_,mg.name_ music_group_name_,sbi.organ_name_,
|
|
|
COUNT(CASE WHEN sa.qualified_flag_ = 1 THEN 1 END) qualified_num_,COUNT(cs.id_) course_num_,COUNT(CASE WHEN cs.type_ = 'SINGLE' THEN 1 END) single_num_,
|
|
|
COUNT(CASE WHEN cs.type_ = 'MIX' THEN 1 END) mix_num_,COUNT(sa.id_) sign_num_,
|
|
|
COUNT(CASE WHEN sa.id_ IS NULL THEN 1 END) not_sign_num_,
|
|
|
GROUP_CONCAT(DISTINCT CASE WHEN sa.id_ IS NULL AND cs.status_ = 'OVER' THEN cs.class_date_ END) not_sign_date_
|
|
|
- from student_extracurricular_exercises_situation_ sees
|
|
|
- left join student_basic_info sbi ON sbi.user_id_ = sees.student_id_
|
|
|
- left join music_group mg ON mg.id_ = sees.music_group_id_
|
|
|
+ FROM student_extracurricular_exercises_situation_ sees
|
|
|
+ LEFT JOIN student_basic_info sbi ON sbi.user_id_ = sees.student_id_
|
|
|
+ LEFT JOIN music_group mg ON mg.id_ = sees.music_group_id_
|
|
|
LEFT JOIN course_schedule_student_payment cssp ON cssp.music_group_id_ = sees.music_group_id_ AND cssp.user_id_ = sees.student_id_ AND cssp.group_type_ = 'MUSIC'
|
|
|
LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_ AND cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0 AND cs.is_lock_ = 0 AND ( cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_ )
|
|
|
LEFT JOIN student_attendance sa ON sa.course_schedule_id_ = cssp.course_schedule_id_ AND sa.user_id_ = cssp.user_id_ AND sa.status_ = 'NORMAL'
|
|
|
- where sees.monday_ >= #{monday} AND sees.sunday_ <= #{sunday}
|
|
|
- group by sees.student_id_,sees.music_group_id_) cs ON cs.student_id_ = sees.student_id_ AND cs.music_group_id_ = sees.music_group_id_
|
|
|
+ WHERE sees.monday_ >= #{monday} AND sees.sunday_ <= #{sunday}
|
|
|
+ GROUP BY sees.student_id_,sees.music_group_id_) cs ON cs.student_id_ = sees.student_id_ AND cs.music_group_id_ = sees.music_group_id_
|
|
|
<where>
|
|
|
<if test="organId != null and organId != ''">
|
|
|
AND FIND_IN_SET(cs.organ_id_,#{organId})
|
|
|
</if>
|
|
|
</where>
|
|
|
- order by cs.organ_id_,cs.student_id_,cs.music_group_id_
|
|
|
+ ORDER BY cs.organ_id_,cs.student_id_,cs.music_group_id_
|
|
|
</select>
|
|
|
</mapper>
|
zouxuan