后台老师考勤列表新增助教老师考勤

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

@@ -252,7 +252,7 @@
     </sql>
     <sql id="queryTeacherAttendancesCondition">
         <where>
-            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.actual_teacher_id_ = ta.teacher_id_
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
             <if test="search != null and search != ''">
                 AND (su.id_ = #{search} OR su.real_name_ LIKE CONCAT('%',#{search},'%') OR cs.id_ = #{search} OR cs.name_ LIKE CONCAT('%',#{search},'%'))
             </if>
@@ -307,8 +307,9 @@
         IF(ta.sign_in_status_ IS NULL,3,ta.sign_in_status_) sign_in_status_,
         IF(ta.sign_out_status_ IS NULL,3,ta.sign_out_status_) sign_out_status_,
         ta.sign_in_time_,ta.sign_out_time_,ta.remark_,o.name_ organ_name_
-        FROM course_schedule cs
-        LEFT JOIN teacher_attendance ta ON ta.course_schedule_id_ = cs.id_
+        FROM course_schedule_teacher_salary csts
+        LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
+        LEFT JOIN teacher_attendance ta ON ta.course_schedule_id_ = csts.course_schedule_id_ AND ta.teacher_id_ = csts.user_id_
         LEFT JOIN teacher t ON t.id_ = ta.teacher_id_
         LEFT JOIN sys_user su ON su.id_ = t.id_
         LEFT JOIN organization o ON o.id_ = cs.organ_id_
@@ -324,8 +325,9 @@
     </select>
 
     <select id="countTeacherAttendances" resultType="int">
-        SELECT COUNT(DISTINCT cs.id_)
-        FROM course_schedule cs
+        SELECT COUNT(csts.id_)
+        FROM course_schedule_teacher_salary csts
+        LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
         LEFT JOIN teacher_attendance ta ON ta.course_schedule_id_ = cs.id_
         LEFT JOIN teacher t ON t.id_ = ta.teacher_id_
         LEFT JOIN sys_user su ON su.id_ = t.id_