From f2c7576cbd050824ec78233483e06fc375382bfb Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 02 四月 2026 17:04:03 +0800
Subject: [PATCH] yys 1.客户档案导入-维护人，维护时间默认当前 2.销售报价审核非必填，产品选择方式也要改 3.销售产品增加物料号字段 4.产品维护增加录入时间，修改时间 6.发货审核不需要了 7.BI的生产核算分析不要了，增加生产订单当前工序 3.库存导入模板规格改成图纸编号，产品名称可以为空，加个库位 4.库存管理外购改为标准件 5.bom产品唯一 6.产品根据bom计算子项数量（只统计二级）
---
src/main/resources/mapper/staff/StaffOnJobMapper.xml | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/staff/StaffOnJobMapper.xml b/src/main/resources/mapper/staff/StaffOnJobMapper.xml
index 6e0a956..75ae5ef 100644
--- a/src/main/resources/mapper/staff/StaffOnJobMapper.xml
+++ b/src/main/resources/mapper/staff/StaffOnJobMapper.xml
@@ -4,10 +4,13 @@
<select id="staffOnJobListPage" resultType="com.ruoyi.staff.dto.StaffOnJobDto">
SELECT
staff_on_job.*,
- sp.post_name as postName
+ 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 staff_state = #{staffOnJob.staffState}
@@ -25,10 +28,13 @@
<select id="staffOnJobList" resultType="com.ruoyi.staff.dto.StaffOnJobDto">
SELECT
staff_on_job.*,
- sp.post_name as postName
+ 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 staff_state = #{staffOnJob.staffState}
@@ -37,4 +43,19 @@
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') <= #{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