From 978a13e543afbb9210b923361af17aa006947244 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 23 七月 2025 14:12:17 +0800
Subject: [PATCH] yys  人员,质量,设备增加时间筛选

---
 src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml b/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml
index be3c392..7b11511 100644
--- a/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml
+++ b/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml
@@ -10,7 +10,12 @@
         <if test="staffJoinLeaveRecord.staffName != null and staffJoinLeaveRecord.staffName != '' ">
             AND staff_name LIKE CONCAT('%',#{staffJoinLeaveRecord.staffName},'%')
         </if>
-
+        <if test="staffJoinLeaveRecord.entryDateStart != null and staffJoinLeaveRecord.entryDateStart != '' ">
+            and contract_start_time like concat('%',#{staffJoinLeaveRecord.entryDateStart},'%')
+        </if>
+        <if test="staffJoinLeaveRecord.entryDateEnd != null and staffJoinLeaveRecord.entryDateEnd != '' ">
+            and contract_end_time like concat('%',#{staffJoinLeaveRecord.entryDateEnd},'%')
+        </if>
     </select>
     <select id="staffJoinLeaveRecordList" resultType="com.ruoyi.staff.pojo.StaffJoinLeaveRecord">
         SELECT
@@ -22,4 +27,13 @@
             AND staff_name LIKE CONCAT('%',#{staffJoinLeaveRecord.staffName},'%')
         </if>
     </select>
+    <select id="staffOnJobList" resultType="com.ruoyi.staff.pojo.StaffJoinLeaveRecord">
+        select *
+        from (select *,
+                     ROW_NUMBER() over (PARTITION BY staff_no ORDER BY create_time DESC ) as rn
+              from staff_join_leave_record
+              where staff_state = 1) t
+        where rn = 1
+
+    </select>
 </mapper>

--
Gitblit v1.9.3