From 48bfcb11f48a0be3b7d9e3fe52d220bb17763c3a Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 03 十二月 2025 18:12:08 +0800
Subject: [PATCH] 产品明细优化
---
src/main/resources/mapper/staff/StaffOnJobMapper.xml | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/staff/StaffOnJobMapper.xml b/src/main/resources/mapper/staff/StaffOnJobMapper.xml
index 37811f4..643050d 100644
--- a/src/main/resources/mapper/staff/StaffOnJobMapper.xml
+++ b/src/main/resources/mapper/staff/StaffOnJobMapper.xml
@@ -3,14 +3,22 @@
<mapper namespace="com.ruoyi.staff.mapper.StaffOnJobMapper">
<select id="staffOnJobListPage" resultType="com.ruoyi.staff.pojo.StaffOnJob">
SELECT
- *
- FROM staff_on_job
+ t1.*,
+ t2.name as deptPositionName
+ FROM staff_on_job t1
+ left join dept_position t2 on t1.dept_position_id = t2.id and t2.type = 2
where 1=1
<if test="staffOnJob.staffState != null and staffOnJob.staffState != '' ">
- AND staff_state = #{staffOnJob.staffState}
+ AND t1.staff_state = #{staffOnJob.staffState}
</if>
<if test="staffOnJob.staffName != null and staffOnJob.staffName != '' ">
- AND staff_name LIKE CONCAT('%',#{staffOnJob.staffName},'%')
+ AND t1.staff_name LIKE CONCAT('%',#{staffOnJob.staffName},'%')
+ </if>
+ <if test="staffOnJob.entryDateStart != null and staffOnJob.entryDateStart != '' ">
+ AND t1.contract_expire_time >= DATE_FORMAT(#{staffOnJob.entryDateStart},'%Y-%m-%d')
+ </if>
+ <if test="staffOnJob.entryDateEnd != null and staffOnJob.entryDateEnd != '' ">
+ AND t1.contract_expire_time <= DATE_FORMAT(#{staffOnJob.entryDateEnd},'%Y-%m-%d')
</if>
</select>
<select id="staffOnJobList" resultType="com.ruoyi.staff.pojo.StaffOnJob">
--
Gitblit v1.9.3