From cd3cb071ebad82444f92575577e6975dae07d383 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 09 二月 2026 17:22:12 +0800
Subject: [PATCH] 打卡签到列表和新增

---
 src/main/resources/mapper/staff/PersonalAttendanceRecordsMapper.xml |   40 ++++++++++++++++++++++++++++++++++++----
 1 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/staff/PersonalAttendanceRecordsMapper.xml b/src/main/resources/mapper/staff/PersonalAttendanceRecordsMapper.xml
index 13d3513..146830b 100644
--- a/src/main/resources/mapper/staff/PersonalAttendanceRecordsMapper.xml
+++ b/src/main/resources/mapper/staff/PersonalAttendanceRecordsMapper.xml
@@ -1,7 +1,39 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.staff.mapper.PersonalAttendanceRecordsMapper">
 
+    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+    <resultMap id="BaseResultMap" type="com.ruoyi.staff.pojo.PersonalAttendanceRecords">
+        <id column="id" property="id" />
+        <result column="staff_on_job_id" property="staffOnJobId" />
+        <result column="date" property="date" />
+        <result column="work_start_at" property="workStartAt" />
+        <result column="work_end_at" property="workEndAt" />
+        <result column="work_hours" property="workHours" />
+        <result column="status" property="status" />
+        <result column="remark" property="remark" />
+        <result column="tenant_id" property="tenantId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
 
-
-</mapper>
\ No newline at end of file
+    <select id="listPage" resultType="com.ruoyi.staff.dto.PersonalAttendanceRecordsDto">
+        SELECT
+        personal_attendance_records.*,
+        soj.staff_name as staffName,
+        soj.staff_no as staffNo,
+        sd.dept_name as deptName
+        FROM personal_attendance_records
+        LEFT JOIN
+        staff_on_job soj ON soj.id = personal_attendance_records.staff_on_job_id
+        LEFT JOIN
+        sys_dept sd ON sd.dept_id = soj.sys_dept_id
+        where 1=1
+        <if test="params.deptId != null and params.deptId > 0">
+            AND sys_dept.dept_id = #{params.deptId}
+        </if>
+        <if test="params.date != null">
+            AND personal_attendance_records.date = DATE_FORMAT(#{params.date},'%Y-%m-%d')
+        </if>
+    </select>
+</mapper>

--
Gitblit v1.9.3