From d346846239a8a39246c464dc634f5fd72add99ab Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 26 八月 2025 15:22:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim-jlmy' into pim-jlmy

---
 main-business/src/main/resources/mapper/StaffOnJobMapper.xml |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+), 0 deletions(-)

diff --git a/main-business/src/main/resources/mapper/StaffOnJobMapper.xml b/main-business/src/main/resources/mapper/StaffOnJobMapper.xml
new file mode 100644
index 0000000..0f6b71b
--- /dev/null
+++ b/main-business/src/main/resources/mapper/StaffOnJobMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.business.mapper.StaffOnJobMapper">
+    <select id="staffOnJobListPage" resultType="com.ruoyi.business.entity.StaffOnJob">
+        SELECT
+        *
+        FROM staff_on_job
+        where 1=1
+        <if test="staffOnJob.staffState != null and staffOnJob.staffState != '' ">
+        AND staff_state = #{staffOnJob.staffState}
+        </if>
+        <if test="staffOnJob.staffName != null and staffOnJob.staffName != '' ">
+            AND staff_name LIKE CONCAT('%',#{staffOnJob.staffName},'%')
+        </if>
+        <if test="staffOnJob.entryDateStart != null and staffOnJob.entryDateStart != '' ">
+            AND contract_expire_time &gt;= to_date(#{staffOnJob.entryDateStart},'YYYY-MM-DD')
+        </if>
+        <if test="staffOnJob.entryDateEnd != null and staffOnJob.entryDateEnd != '' ">
+            AND contract_expire_time &lt;= to_date(#{staffOnJob.entryDateEnd},'YYYY-MM-DD')
+        </if>
+    </select>
+    <select id="staffOnJobList" resultType="com.ruoyi.business.entity.StaffOnJob">
+        SELECT
+        *
+        FROM staff_on_job
+        where 1=1
+        <if test="staffOnJob.staffState != null and staffOnJob.staffState != '' ">
+            AND staff_state = #{staffOnJob.staffState}
+        </if>
+        <if test="staffOnJob.staffName != null and staffOnJob.staffName != '' ">
+            AND staff_name LIKE CONCAT('%',#{staffOnJob.staffName},'%')
+        </if>
+    </select>
+</mapper>

--
Gitblit v1.9.3