Browse Source

考勤统计调整

dzx 6 months ago
parent
commit
8c64680e39

+ 6 - 1
src/main/resources/mapper/attendance/TeacherAttendanceRecordMapper.xml

@@ -5,7 +5,12 @@
 <mapper namespace="com.xjrsoft.module.attendance.mapper.TeacherAttendanceRecordMapper">
     <select id="getPage" parameterType="com.xjrsoft.module.attendance.dto.TeacherDetailsDto" resultType="com.xjrsoft.module.attendance.vo.TeacherStatisticsPageVo">
         SELECT t2.name AS teacher_name,t2.mobile,t1.attendance_status AS STATUS,t1.record_time,
-        replace(replace(t1.attendance_mode,1, '人脸'),2,'车辆') as attendance_mode,t1.car_number,t1.user_id
+        replace(replace(t1.attendance_mode,1, '人脸'),2,'车辆') as attendance_mode,t1.car_number,t1.user_id,
+        (
+            select group_concat(a1.name) from xjr_department a1
+            inner join xjr_user_dept_relation a2 on a1.id = a2.dept_id
+            where a1.delete_mark = 0 and a2.user_id = t1.user_id
+        ) as dept_name
         FROM teacher_attendance_record t1
         INNER JOIN xjr_user t2 ON t1.user_id = t2.id
         <if test="dto.deptId != null">