From 7b2233d1dab53574facc66b3bebffcd8ca5919de Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 21 三月 2026 14:27:19 +0800
Subject: [PATCH] yys 1.已退货完毕的出库单号不要展示在关联出库单中 2.退货管理唯一处理 3.生产订单-库存数量回显 4.发货管理回显退货数量 5.发货增加详情接口 6.生产核算清理脏数据 7.生产报工-删除生产报工记录报错 8.筛选客户名称数据展示有误

---
 src/main/resources/mapper/staff/StaffOnJobMapper.xml |   45 +++++++++++++++++++++++++++++++++++++++------
 1 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/mapper/staff/StaffOnJobMapper.xml b/src/main/resources/mapper/staff/StaffOnJobMapper.xml
index 37811f4..75ae5ef 100644
--- a/src/main/resources/mapper/staff/StaffOnJobMapper.xml
+++ b/src/main/resources/mapper/staff/StaffOnJobMapper.xml
@@ -1,28 +1,61 @@
 <?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.staff.mapper.StaffOnJobMapper">
-    <select id="staffOnJobListPage" resultType="com.ruoyi.staff.pojo.StaffOnJob">
+    <select id="staffOnJobListPage" resultType="com.ruoyi.staff.dto.StaffOnJobDto">
         SELECT
-        *
+        staff_on_job.*,
+        sp.post_name as postName,
+        sd.dept_name as deptName
         FROM staff_on_job
+        LEFT JOIN
+        sys_post sp ON sp.post_id = staff_on_job.sys_post_id
+        LEFT JOIN
+        sys_dept sd ON sd.dept_id = staff_on_job.sys_dept_id
         where 1=1
-        <if test="staffOnJob.staffState != null and staffOnJob.staffState != '' ">
+        <if test="staffOnJob.staffState != null">
         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;= DATE_FORMAT(#{staffOnJob.entryDateStart},'%Y-%m-%d')
+        </if>
+        <if test="staffOnJob.entryDateEnd != null and staffOnJob.entryDateEnd != '' ">
+            AND  contract_expire_time &lt;= DATE_FORMAT(#{staffOnJob.entryDateEnd},'%Y-%m-%d')
+        </if>
     </select>
-    <select id="staffOnJobList" resultType="com.ruoyi.staff.pojo.StaffOnJob">
+    <select id="staffOnJobList" resultType="com.ruoyi.staff.dto.StaffOnJobDto">
         SELECT
-        *
+        staff_on_job.*,
+        sp.post_name as postName,
+        sd.dept_name as deptName
         FROM staff_on_job
+        LEFT JOIN
+        sys_post sp ON sp.post_id = staff_on_job.sys_post_id
+        LEFT JOIN
+        sys_dept sd ON sd.dept_id = staff_on_job.sys_dept_id
         where 1=1
-        <if test="staffOnJob.staffState != null and staffOnJob.staffState != '' ">
+        <if test="staffOnJob.staffState != null">
             AND staff_state = #{staffOnJob.staffState}
         </if>
         <if test="staffOnJob.staffName != null and staffOnJob.staffName != '' ">
             AND staff_name LIKE CONCAT('%',#{staffOnJob.staffName},'%')
         </if>
     </select>
+    <!-- 缁熻鎸囧畾鏃ユ湡鐨勫湪鑱屽憳宸ユ暟 -->
+    <select id="countOnJobStaffByDate" resultType="java.lang.Integer">
+        SELECT COUNT(*)
+        FROM staff_on_job
+        WHERE staff_state = 1
+        AND DATE_FORMAT(create_time, '%Y-%m-%d') &lt;= #{date}
+    </select>
+
+    <!-- 缁熻鎸囧畾鏈堜唤鐨勬柊鍏ヨ亴鍛樺伐鏁� -->
+    <select id="countNewHireByMonth" resultType="java.lang.Integer">
+        SELECT COUNT(*)
+        FROM staff_on_job
+        WHERE staff_state = 1
+        AND DATE_FORMAT(create_time, '%Y-%m-%d') BETWEEN #{monthStart} AND #{monthEnd}
+    </select>
 </mapper>

--
Gitblit v1.9.3