|
@@ -303,7 +303,7 @@
|
|
|
LEFT JOIN teacher_attendance ta ON cs.id_ = ta.course_schedule_id_
|
|
|
LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
|
|
|
<include refid="queryCloses"/>
|
|
|
- ORDER BY cs.class_date_ DESC,cs.start_class_time_ DESC
|
|
|
+ ORDER BY cs.class_date_,cs.start_class_time_ DESC
|
|
|
<include refid="global.limit"/>
|
|
|
</select>
|
|
|
|
|
@@ -478,6 +478,7 @@
|
|
|
|
|
|
<sql id="queryCloses">
|
|
|
<where>
|
|
|
+ CONCAT(cs.class_date_,' ',cs.start_class_time_) < NOW()
|
|
|
<if test="teacherId != null">
|
|
|
AND cs.actual_teacher_id_ = #{teacherId}
|
|
|
</if>
|