From eddc08aa2fa3402688ec8b4b24669ddd2e51bf86 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 08 五月 2026 17:43:19 +0800
Subject: [PATCH] feat(staff): 添加民族字段及相关查询支持
---
src/main/resources/mapper/staff/StaffOnJobMapper.xml | 3 +++
src/main/resources/mapper/staff/StaffLeaveMapper.xml | 4 ++++
src/main/java/com/ruoyi/staff/dto/StaffLeaveDto.java | 5 +++++
3 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/dto/StaffLeaveDto.java b/src/main/java/com/ruoyi/staff/dto/StaffLeaveDto.java
index 3685410..98e3c12 100644
--- a/src/main/java/com/ruoyi/staff/dto/StaffLeaveDto.java
+++ b/src/main/java/com/ruoyi/staff/dto/StaffLeaveDto.java
@@ -99,4 +99,9 @@
* 绂昏亴鍘熷洜鏂囨湰
*/
private String reasonText;
+
+ /**
+ * 姘戞棌
+ */
+ private String nation;
}
diff --git a/src/main/resources/mapper/staff/StaffLeaveMapper.xml b/src/main/resources/mapper/staff/StaffLeaveMapper.xml
index 4637ff0..b1b55b4 100644
--- a/src/main/resources/mapper/staff/StaffLeaveMapper.xml
+++ b/src/main/resources/mapper/staff/StaffLeaveMapper.xml
@@ -9,6 +9,7 @@
soj.staff_no as staffNo,
soj.sex as sex,
soj.native_place as nativePlace,
+ soj.nation as nation,
soj.adress as adress,
soj.first_study as firstStudy,
soj.profession as profession,
@@ -30,6 +31,9 @@
<if test="c.staffName != null and c.staffName != '' ">
AND soj.staff_name LIKE CONCAT('%',#{c.staffName},'%')
</if>
+ <if test="c.nation != null and c.nation != '' ">
+ AND soj.nation = #{c.nation}
+ </if>
</select>
<select id="staffLeaveList" resultType="com.ruoyi.staff.dto.StaffLeaveDto">
SELECT
diff --git a/src/main/resources/mapper/staff/StaffOnJobMapper.xml b/src/main/resources/mapper/staff/StaffOnJobMapper.xml
index b0c85bc..fa8f84d 100644
--- a/src/main/resources/mapper/staff/StaffOnJobMapper.xml
+++ b/src/main/resources/mapper/staff/StaffOnJobMapper.xml
@@ -17,6 +17,9 @@
<if test="staffOnJob.staffState != null">
AND staff_state = #{staffOnJob.staffState}
</if>
+ <if test="staffOnJob.nation != null">
+ AND nation = #{staffOnJob.nation}
+ </if>
<if test="staffOnJob.staffName != null and staffOnJob.staffName != '' ">
AND staff_name LIKE CONCAT('%',#{staffOnJob.staffName},'%')
</if>
--
Gitblit v1.9.3