|
@@ -472,9 +472,13 @@
|
|
|
class_group cg
|
|
|
LEFT JOIN class_group_student_mapper cgsm ON cg.id_ = cgsm.class_group_id_
|
|
|
LEFT JOIN music_group mg ON cg.music_group_id_=mg.id_
|
|
|
+ LEFT JOIN course_schedule cs ON cs.class_group_id_=cg.id_
|
|
|
WHERE
|
|
|
cg.type_ IN ('HIGH', 'HIGH_ONLINE')
|
|
|
AND mg.status_ = 'PROGRESS' AND cg.del_flag_ = 0
|
|
|
+ AND cs.del_flag_=0
|
|
|
+ AND cs.status_='NOT_START'
|
|
|
+ AND ( cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_ )
|
|
|
<if test="organIds!=null and organIds.size()>0">
|
|
|
AND mg.organ_id_ IN
|
|
|
<foreach collection="organIds" item="organId" open="(" close=")" separator=",">
|