update

mec-biz/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -372,6 +372,7 @@
 
     <sql id="queryTeacherAttendanceSql">
         <where>
+            CONCAT(cs.class_date_,' ',cs.start_class_time_) &lt; NOW() AND cgtm.teacher_role_ = 'BISHOP'
             <if test="startTime != null and startTime != ''">
                 AND cs.class_date_ &gt;= #{startTime}
             </if>
@@ -401,8 +402,9 @@
         FROM course_schedule cs
         LEFT JOIN teacher_attendance ta ON cs.id_ = ta.course_schedule_id_
         LEFT JOIN sys_user su ON su.id_ = ta.teacher_id_
+        LEFT JOIN class_group_teacher_mapper cgtm ON cgtm.class_group_id_ = cs.class_group_id_ AND ta.teacher_id_ = cgtm.user_id_
         <include refid="queryTeacherAttendanceSql"/>
-        ORDER BY cs.class_date_ DESC
+        ORDER BY cs.class_date_ DESC,cs.start_class_time_ DESC
         <include refid="global.limit"/>
     </select>
     <select id="countTeacherAttendance" resultType="java.lang.Integer">
@@ -410,6 +412,7 @@
         FROM course_schedule cs
         LEFT JOIN teacher_attendance ta ON cs.id_ = ta.course_schedule_id_
         LEFT JOIN sys_user su ON su.id_ = ta.teacher_id_
+        LEFT JOIN class_group_teacher_mapper cgtm ON cgtm.class_group_id_ = cs.class_group_id_ AND ta.teacher_id_ = cgtm.user_id_
         <include refid="queryTeacherAttendanceSql"/>
     </select>
     <select id="queryNameById" resultType="java.lang.String">