|
@@ -241,7 +241,7 @@
|
|
|
csr.music_theory_,csr.song_,csr.memo_,csr.create_time_,csr.has_liaison_,csr.update_time_,sa.id_
|
|
|
attendance_id_,sch.is_replied_ home_work_replied_
|
|
|
FROM course_schedule cs
|
|
|
- LEFT JOIN practice_group pg ON cs.music_group_id_ = pg.id_
|
|
|
+ LEFT JOIN practice_group pg ON cs.music_group_id_ = pg.id_ AND cs.group_type_='PRACTICE'
|
|
|
LEFT JOIN sys_user su ON cs.actual_teacher_id_ = su.id_
|
|
|
LEFT JOIN sys_user edsu ON pg.educational_teacher_id_ = edsu.id_
|
|
|
LEFT JOIN course_schedule_review csr on cs.id_ = csr.course_schedule_id_
|
|
@@ -255,7 +255,7 @@
|
|
|
|
|
|
<select id="countPracticeGroupReviews" resultType="java.lang.Integer">
|
|
|
SELECT count(*) FROM course_schedule cs
|
|
|
- LEFT JOIN practice_group pg ON cs.music_group_id_ = pg.id_
|
|
|
+ LEFT JOIN practice_group pg ON cs.music_group_id_ = pg.id_ AND cs.group_type_='PRACTICE'
|
|
|
LEFT JOIN course_schedule_review csr on cs.id_ = csr.course_schedule_id_
|
|
|
LEFT JOIN course_schedule_complaints csc on csc.course_schedule_id_ = cs.id_
|
|
|
LEFT JOIN student_attendance sa on sa.course_schedule_id_ = cs.id_
|
|
@@ -299,7 +299,7 @@
|
|
|
SELECT csr.id_,cs.class_date_, pg.name_ course_name_,su.real_name_ teacher_name_,csr.hand_homework_
|
|
|
FROM course_schedule_review csr
|
|
|
LEFT JOIN course_schedule cs on cs.id_ = csr.course_schedule_id_
|
|
|
- LEFT JOIN practice_group pg ON cs.music_group_id_ = pg.id_
|
|
|
+ LEFT JOIN practice_group pg ON cs.music_group_id_ = pg.id_ AND cs.group_type_='PRACTICE'
|
|
|
LEFT JOIN sys_user su ON cs.actual_teacher_id_ = su.id_
|
|
|
<include refid="practiceGroupReviews4EduQueryCondition"/>
|
|
|
<include refid="global.limit"/>
|
|
@@ -309,7 +309,7 @@
|
|
|
<select id="countPracticeGroupReviews4Edu" resultType="java.lang.Integer">
|
|
|
SELECT count(*) FROM course_schedule_review csr
|
|
|
LEFT JOIN course_schedule cs on cs.id_ = csr.course_schedule_id_
|
|
|
- LEFT JOIN practice_group pg ON cs.music_group_id_ = pg.id_
|
|
|
+ LEFT JOIN practice_group pg ON cs.music_group_id_ = pg.id_ AND cs.group_type_='PRACTICE'
|
|
|
<include refid="practiceGroupReviews4EduQueryCondition"/>
|
|
|
</select>
|
|
|
|