|
@@ -860,7 +860,7 @@
|
|
|
LEFT JOIN (
|
|
|
SELECT DISTINCT cs.id_
|
|
|
FROM course_schedule cs
|
|
|
- WHERE cs.group_type_ = 'MUSIC' AND cs.class_date_ = DATE_FORMAT(NOW(), '%Y-%m-%d')
|
|
|
+ WHERE cs.group_type_ = 'MUSIC' AND cs.class_date_ = DATE_FORMAT(NOW(), '%Y-%m-%d') and cs.actual_teacher_id_ = #{teacherId}
|
|
|
) music_cs ON FIND_IN_SET(music_cs.id_, se.course_ids_)
|
|
|
WHERE se.teacher_id_ = #{teacherId}
|
|
|
AND se.expect_exercises_num_ > se.actual_exercises_num_
|
|
@@ -873,7 +873,7 @@
|
|
|
LEFT JOIN (
|
|
|
SELECT DISTINCT cs.id_
|
|
|
FROM course_schedule cs
|
|
|
- WHERE cs.group_type_ != 'MUSIC' AND cs.class_date_ <= DATE_FORMAT(NOW(), '%Y-%m-%d')
|
|
|
+ WHERE cs.group_type_ != 'MUSIC' AND cs.class_date_ >= DATE_SUB(CURDATE(), INTERVAL 30 DAY) and cs.actual_teacher_id_ = #{teacherId}
|
|
|
) non_music_cs ON FIND_IN_SET(non_music_cs.id_, se.course_ids_)
|
|
|
WHERE se.teacher_id_ = #{teacherId}
|
|
|
AND se.expect_exercises_num_ > se.actual_exercises_num_
|