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/StaffLeaveMapper.xml | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/staff/StaffLeaveMapper.xml b/src/main/resources/mapper/staff/StaffLeaveMapper.xml
index 1d43ecc..4637ff0 100644
--- a/src/main/resources/mapper/staff/StaffLeaveMapper.xml
+++ b/src/main/resources/mapper/staff/StaffLeaveMapper.xml
@@ -17,12 +17,15 @@
soj.phone as phone,
soj.emergency_contact as emergencyContact,
soj.emergency_contact_phone as emergencyContactPhone,
- sp.post_name as postName
+ sp.post_name as postName,
+ sd.dept_name as deptName
FROM staff_leave
LEFT JOIN
staff_on_job soj ON soj.id = staff_leave.staff_on_job_id
LEFT JOIN
sys_post sp ON sp.post_id = soj.sys_post_id
+ LEFT JOIN
+ sys_dept sd ON sd.dept_id = soj.sys_dept_id
where 1=1
<if test="c.staffName != null and c.staffName != '' ">
AND soj.staff_name LIKE CONCAT('%',#{c.staffName},'%')
@@ -44,15 +47,38 @@
soj.phone as phone,
soj.emergency_contact as emergencyContact,
soj.emergency_contact_phone as emergencyContactPhone,
- sp.post_name as postName
+ sp.post_name as postName,
+ sd.dept_name as deptName
FROM staff_leave
LEFT JOIN
staff_on_job soj ON soj.id = staff_leave.staff_on_job_id
LEFT JOIN
sys_post sp ON sp.post_id = soj.sys_post_id
+ LEFT JOIN
+ sys_dept sd ON sd.dept_id = soj.sys_dept_id
where 1=1
<if test="c.staffName != null and c.staffName != '' ">
AND soj.staff_name LIKE CONCAT('%',#{c.staffName},'%')
</if>
</select>
+
+ <select id="staffLeaveReasonAnalytics" resultType="com.ruoyi.staff.dto.StaffLeaveDto">
+ SELECT
+ staff_leave.reason as reason,
+ COUNT(*) as count
+ FROM staff_leave
+ LEFT JOIN
+ staff_on_job soj ON soj.id = staff_leave.staff_on_job_id
+ where 1=1
+ GROUP BY staff_leave.reason
+ </select>
+
+ <!-- 缁熻鎸囧畾鏈堜唤鐨勭鑱屽憳宸ユ暟 -->
+ <select id="countLeaveByMonth" resultType="java.lang.Integer">
+ SELECT COUNT(*)
+ FROM staff_leave sl
+ LEFT JOIN staff_on_job soj ON sl.staff_on_job_id = soj.id
+ WHERE DATE_FORMAT(sl.create_time, '%Y-%m-%d') BETWEEN #{monthStart} AND #{monthEnd}
+ AND soj.staff_state = 0
+ </select>
</mapper>
--
Gitblit v1.9.3