|
@@ -570,7 +570,17 @@
|
|
|
WHERE
|
|
|
FIND_IN_SET(#{subjectId}, t.subject_id_)
|
|
|
AND (t.organ_id_ = #{studentOrganId} OR FIND_IN_SET(#{studentOrganId},t.flow_organ_range_))
|
|
|
- AND NOT EXISTS (SELECT user_id_ FROM practice_group WHERE student_id_=#{studentId} AND t.id_=user_id_ AND type_='TRIAL')
|
|
|
+ AND NOT EXISTS (SELECT
|
|
|
+ cs.actual_teacher_id_
|
|
|
+ FROM
|
|
|
+ course_schedule_student_payment cssp
|
|
|
+ LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
|
|
|
+ LEFT JOIN practice_group pg ON cssp.music_group_id_=pg.id_
|
|
|
+ WHERE
|
|
|
+ cssp.user_id_ = #{studentId}
|
|
|
+ AND cs.actual_teacher_id_ = t.id_
|
|
|
+ AND pg.type_='TRIAL'
|
|
|
+ AND cssp.group_type_ = 'PRACTICE')
|
|
|
</select>
|
|
|
|
|
|
<select id="findLastPracticeSubject" resultType="int">
|