From e1fba46a50e2f5036b1a5fd59f459e61495eb888 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 08 七月 2026 16:43:44 +0800
Subject: [PATCH] 已进行排班并且人员已打卡的前提下，对应的班次配置不能编辑删除。

---
 src/main/resources/mapper/staff/PersonalAttendanceRecordsMapper.xml |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/staff/PersonalAttendanceRecordsMapper.xml b/src/main/resources/mapper/staff/PersonalAttendanceRecordsMapper.xml
index 5f423e8..4a15bbf 100644
--- a/src/main/resources/mapper/staff/PersonalAttendanceRecordsMapper.xml
+++ b/src/main/resources/mapper/staff/PersonalAttendanceRecordsMapper.xml
@@ -39,13 +39,23 @@
             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="selectStaffWithoutAttendanceRecord" resultType="com.ruoyi.staff.pojo.StaffOnJob">
+    <!-- 鏌ヨ鎸囧畾鏃ユ湡鏈夋帓鐝紙闈炶鍋囷級浣嗘病鏈夎�冨嫟璁板綍鐨勫湪鑱屽憳宸ワ紝娌℃帓鐝涓轰紤鎭笉鏍囪缂哄嫟 -->
+    <select id="selectStaffWithoutAttendanceRecordBeforeTime" resultType="com.ruoyi.staff.pojo.StaffOnJob">
         SELECT soj.*
         FROM staff_on_job soj
-        WHERE soj.status = 1
-        AND DATE(soj.create_time) &lt; #{date}
+        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
@@ -53,4 +63,14 @@
         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