From d29080af4e965ba341cb85a5bc45ecd183c06783 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 14 八月 2026 17:45:45 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_pro_山西_晋和园

---
 src/main/resources/mapper/staff/PersonalAttendanceRecordsMapper.xml |   41 +++++++++++++++++++++++++++++++++++++++--
 1 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/staff/PersonalAttendanceRecordsMapper.xml b/src/main/resources/mapper/staff/PersonalAttendanceRecordsMapper.xml
index 146830b..4a15bbf 100644
--- a/src/main/resources/mapper/staff/PersonalAttendanceRecordsMapper.xml
+++ b/src/main/resources/mapper/staff/PersonalAttendanceRecordsMapper.xml
@@ -29,11 +29,48 @@
         LEFT JOIN
         sys_dept sd ON sd.dept_id = soj.sys_dept_id
         where 1=1
+        <if test="params.staffOnJobId != null and params.staffOnJobId > 0">
+            AND personal_attendance_records.staff_on_job_id = #{params.staffOnJobId}
+        </if>
         <if test="params.deptId != null and params.deptId > 0">
-            AND sys_dept.dept_id = #{params.deptId}
+            AND sd.dept_id = #{params.deptId}
         </if>
         <if test="params.date != null">
-            AND personal_attendance_records.date = DATE_FORMAT(#{params.date},'%Y-%m-%d')
+            and personal_attendance_records.date &gt;= #{params.date}
+            and personal_attendance_records.date &lt; DATE_ADD(DATE(#{params.date}), INTERVAL 1 DAY)
         </if>
+        order by personal_attendance_records.id desc
+    </select>
+
+    <!-- 鏌ヨ鎸囧畾鏃ユ湡鏈夋帓鐝紙闈炶鍋囷級浣嗘病鏈夎�冨嫟璁板綍鐨勫湪鑱屽憳宸ワ紝娌℃帓鐝涓轰紤鎭笉鏍囪缂哄嫟 -->
+    <select id="selectStaffWithoutAttendanceRecordBeforeTime" resultType="com.ruoyi.staff.pojo.StaffOnJob">
+        SELECT soj.*
+        FROM staff_on_job soj
+        WHERE soj.staff_state = 1
+        AND soj.create_time &lt; #{entryDeadline}
+        AND EXISTS (
+        SELECT 1
+        FROM personal_shift ps
+        WHERE ps.staff_on_job_id = soj.id
+        AND DATE(ps.work_time) = #{date}
+        AND ps.personal_attendance_location_config_id IS NOT NULL
+        AND ps.personal_attendance_location_config_id != 999
+        )
+        AND NOT EXISTS (
+        SELECT 1
+        FROM personal_attendance_records par
+        WHERE par.staff_on_job_id = soj.id
+        AND par.date = #{date}
+        )
+    </select>
+
+    <!-- 妫�鏌ユ寚瀹氬憳宸ュ湪鎸囧畾鏃ユ湡鏄惁宸插瓨鍦ㄨ�冨嫟璁板綍 -->
+    <select id="existsAttendanceRecord" resultType="boolean">
+        SELECT EXISTS (
+        SELECT 1
+        FROM personal_attendance_records
+        WHERE staff_on_job_id = #{staffOnJobId}
+        AND date = #{date}
+        )
     </select>
 </mapper>

--
Gitblit v1.9.3