|
@@ -479,7 +479,7 @@
|
|
|
course_name_,su.real_name_ teacher_name_,edsu.real_name_
|
|
|
edu_teacher_name_,csr.id_
|
|
|
review_id_,csr.hand_homework_,csr.course_review_,csr.teaching_material_,csr.pronunciation_,csr.tempo_,
|
|
|
- csr.music_theory_,csr.song_,csr.memo_,csr.create_time_,csr.has_liaison_,csr.update_time_,sa.id_ attendance_id_,
|
|
|
+ csr.music_theory_,csr.song_,csr.memo_,csr.create_time_,csr.has_liaison_,csr.update_time_,
|
|
|
CASE WHEN ch.id_ IS NULL THEN 0 ELSE 1 END assign_homework_
|
|
|
FROM course_schedule cs
|
|
|
LEFT JOIN vip_group vg ON cs.music_group_id_ = vg.id_ AND cs.group_type_='VIP'
|
|
@@ -488,9 +488,6 @@
|
|
|
LEFT JOIN sys_user edsu ON vg.educational_teacher_id_ = edsu.id_
|
|
|
LEFT JOIN course_schedule_review csr on cs.id_ = csr.course_schedule_id_
|
|
|
LEFT JOIN course_homework ch on ch.course_schedule_id_ = cs.id_
|
|
|
- LEFT JOIN (
|
|
|
- SELECT course_schedule_id_,id_ FROM student_attendance LIMIT 1
|
|
|
- ) sa ON sa.course_schedule_id_ = cs.id_
|
|
|
<include refid="vipGroupReviewsQueryCondition"/>
|
|
|
ORDER BY cs.class_date_ DESC
|
|
|
<include refid="global.limit"/>
|
|
@@ -502,9 +499,6 @@
|
|
|
LEFT JOIN class_group cg ON cg.music_group_id_=vg.id_ AND cg.group_type_ = 'VIP'
|
|
|
LEFT JOIN course_schedule_review csr on cs.id_ = csr.course_schedule_id_
|
|
|
LEFT JOIN course_homework ch on ch.course_schedule_id_ = cs.id_
|
|
|
- LEFT JOIN (
|
|
|
- SELECT course_schedule_id_,id_ FROM student_attendance LIMIT 1
|
|
|
- ) sa ON sa.course_schedule_id_ = cs.id_
|
|
|
<include refid="vipGroupReviewsQueryCondition"/>
|
|
|
</select>
|
|
|
|
|
@@ -556,12 +550,6 @@
|
|
|
<if test="endTime !=null">
|
|
|
<![CDATA[AND cs.class_date_ <= #{endTime} ]]>
|
|
|
</if>
|
|
|
- <if test='hasArrived !=null and hasArrived=="1"'>
|
|
|
- AND sa.id_ > 0
|
|
|
- </if>
|
|
|
- <if test='hasArrived !=null and hasArrived=="0"'>
|
|
|
- AND sa.id_ IS NULL
|
|
|
- </if>
|
|
|
</where>
|
|
|
</sql>
|
|
|
</mapper>
|