|
|
@@ -2300,7 +2300,7 @@
|
|
|
|
|
|
<select id="endFindCourseSchedules" resultMap="CourseScheduleEndDto">
|
|
|
SELECT
|
|
|
- cs.id_,
|
|
|
+ (CASE WHEN cs.new_course_id_ IS NULL THEN cs.id_ ELSE cs.new_course_id_ END) id_,
|
|
|
cs.new_course_id_,
|
|
|
cs.group_type_,
|
|
|
cs.music_group_id_,
|
|
|
@@ -2322,7 +2322,8 @@
|
|
|
course_schedule cs
|
|
|
LEFT JOIN school s ON cs.schoole_id_=s.id_
|
|
|
LEFT JOIN organization o ON cs.organ_id_=o.id_
|
|
|
- LEFT JOIN student_attendance sa ON sa.course_schedule_id_ = cs.id_ AND sa.remark_ IS NULL
|
|
|
+ LEFT JOIN student_attendance sa ON sa.course_schedule_id_ = (CASE WHEN cs.new_course_id_ IS NULL THEN cs.id_ ELSE cs.new_course_id_ END)
|
|
|
+ AND sa.remark_ IS NULL
|
|
|
<include refid="endFindCourseSchedulesCondition"/>
|
|
|
GROUP BY cs.id_
|
|
|
ORDER BY course_start_time_,cs.id_
|
