|
@@ -388,6 +388,7 @@
|
|
|
LEFT JOIN practice_group pg ON cssp.music_group_id_ = pg.id_ AND cssp.group_type_ = 'PRACTICE'
|
|
|
LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
|
|
|
WHERE pg.id_ >= 1
|
|
|
+ AND pg.group_status_ IN ('NORMAL', 'FINISH')
|
|
|
AND cs.id_ >=1
|
|
|
AND (cs.is_lock_ IS NULL OR cs.is_lock_=0)
|
|
|
AND CONCAT(cs.class_date_, ' ', cs.end_class_time_) >= #{classDate}
|
|
@@ -406,7 +407,8 @@
|
|
|
pcssp.group_type_='PRACTICE'
|
|
|
LEFT JOIN course_schedule vcs ON vcs.id_=vcssp.course_schedule_id_ AND vcs.teach_mode_='ONLINE'
|
|
|
LEFT JOIN course_schedule pcs ON pcs.id_=pcssp.course_schedule_id_
|
|
|
- WHERE vcs.id_ >=1
|
|
|
+ WHERE pg.group_status_ IN ('NORMAL', 'FINISH')
|
|
|
+ AND vcs.id_ >=1
|
|
|
AND pcs.id_ >= 1
|
|
|
AND (vcs.is_lock_ IS NULL OR vcs.is_lock_=0)
|
|
|
AND (pcs.is_lock_ IS NULL OR pcs.is_lock_=0)
|