|
|
@@ -499,7 +499,7 @@
|
|
|
cs.name_ course_schedule_name_,cs.status_ course_status_,
|
|
|
cs.actual_teacher_id_ teacher_id_,cs.class_date_ ,cs.start_class_time_,cs.end_class_time_ ,cs.new_course_id_,
|
|
|
CASE WHEN sa.visit_flag_ IS NULL THEN 0 ELSE sa.visit_flag_ END visitFlag,
|
|
|
- CASE WHEN sa.status_ IS NULL OR sa.status_ = 'TRUANT' THEN 'LEAVE1' ELSE sa.status_ END status_1
|
|
|
+ CASE WHEN sa.status_ IS NULL OR sa.status_ = 'TRUANT' THEN '1LEAVE' ELSE sa.status_ END status_1
|
|
|
FROM course_schedule_student_payment cssp left join course_schedule cs on cs.id_ = cssp.course_schedule_id_
|
|
|
left join student_attendance sa on cssp.course_schedule_id_ = sa.course_schedule_id_ and cssp.user_id_ = sa.user_id_
|
|
|
LEFT JOIN sys_user su ON cssp.user_id_ = su.id_
|
|
|
@@ -509,7 +509,7 @@
|
|
|
GROUP BY cssp.id_
|
|
|
ORDER BY
|
|
|
<if test="orderFlag == 1 and search != null and search != ''">
|
|
|
- status_1 DESC,visitFlag,cssp.id_,
|
|
|
+ status_1,visitFlag,cssp.id_,
|
|
|
</if>
|
|
|
CONCAT(cs.class_date_, ' ', cs.start_class_time_) ASC
|
|
|
<include refid="global.limit"/>
|
zouxuan