From 54441b789704a6ca10247fe44b342801d8a14353 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 12 九月 2025 16:03:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml b/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml
index 82b7609..d720d37 100644
--- a/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml
+++ b/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml
@@ -10,7 +10,13 @@
<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>
+ order by create_time desc
</select>
<select id="staffJoinLeaveRecordList" resultType="com.ruoyi.staff.pojo.StaffJoinLeaveRecord">
SELECT
--
Gitblit v1.9.3