From 7e2abbf8f235d20e6c45aa6ce9dceb9eb93fd1c2 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 23 一月 2026 11:39:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
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