|
@@ -2295,20 +2295,21 @@
|
|
|
cs.schoole_id_,
|
|
|
s.name_ schoole_name_,
|
|
|
o.name_ organ_name_,
|
|
|
- CASE WHEN sa.id_ IS NULL THEN 0 ELSE 1 END isCallNames
|
|
|
+ CASE WHEN COUNT(sa.id_) > 0 THEN 1 ELSE 0 END isCallNames
|
|
|
FROM
|
|
|
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_
|
|
|
<include refid="endFindCourseSchedulesCondition"/>
|
|
|
- ORDER BY course_start_time_,cs.id_,sa.course_schedule_id_
|
|
|
+ GROUP BY cs.id_
|
|
|
+ ORDER BY course_start_time_,cs.id_
|
|
|
<include refid="global.limit"/>
|
|
|
</select>
|
|
|
|
|
|
<select id="endCountCourseSchedules" resultType="int">
|
|
|
SELECT
|
|
|
- COUNT(cs.id_)
|
|
|
+ COUNT(DISTINCT cs.id_)
|
|
|
FROM
|
|
|
course_schedule cs
|
|
|
LEFT JOIN student_attendance sa ON sa.course_schedule_id_ = cs.id_
|