From b29a49a5ef467ff5c96b5590d76018721bdf8e98 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 21 十一月 2025 13:27:09 +0800
Subject: [PATCH] yys 1.设备去掉名称唯一性验证
---
src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml b/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml
index 82b7609..fde6af6 100644
--- a/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml
+++ b/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml
@@ -3,14 +3,22 @@
<mapper namespace="com.ruoyi.staff.mapper.StaffJoinLeaveRecordMapper">
<select id="staffJoinLeaveRecordListPage" resultType="com.ruoyi.staff.pojo.StaffJoinLeaveRecord">
SELECT
- *
- FROM staff_join_leave_record
+ t1.*,
+ t2.name as deptPositionName
+ FROM staff_join_leave_record t1
+ left join dept_position t2 on t1.dept_position_id = t2.id and t2.type = 2
where
staff_state = #{staffJoinLeaveRecord.staffState}
<if test="staffJoinLeaveRecord.staffName != null and staffJoinLeaveRecord.staffName != '' ">
- AND staff_name LIKE CONCAT('%',#{staffJoinLeaveRecord.staffName},'%')
+ AND t1.staff_name LIKE CONCAT('%',#{staffJoinLeaveRecord.staffName},'%')
</if>
-
+ <if test="staffJoinLeaveRecord.entryDateStart != null and staffJoinLeaveRecord.entryDateStart != '' ">
+ and t1.contract_start_time like concat('%',#{staffJoinLeaveRecord.entryDateStart},'%')
+ </if>
+ <if test="staffJoinLeaveRecord.entryDateEnd != null and staffJoinLeaveRecord.entryDateEnd != '' ">
+ and t1.contract_end_time like concat('%',#{staffJoinLeaveRecord.entryDateEnd},'%')
+ </if>
+ order by t1.create_time desc
</select>
<select id="staffJoinLeaveRecordList" resultType="com.ruoyi.staff.pojo.StaffJoinLeaveRecord">
SELECT
--
Gitblit v1.9.3