From 72a372cb26c4ba489efae6b65dbf9fdfea1b5815 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 19 十一月 2025 16:53:11 +0800
Subject: [PATCH] yys 1.劳保台账修改
---
src/main/resources/mapper/lavorissue/LavorIssueMapper.xml | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/lavorissue/LavorIssueMapper.xml b/src/main/resources/mapper/lavorissue/LavorIssueMapper.xml
index 81cf11d..dfe8270 100644
--- a/src/main/resources/mapper/lavorissue/LavorIssueMapper.xml
+++ b/src/main/resources/mapper/lavorissue/LavorIssueMapper.xml
@@ -8,11 +8,13 @@
t2.staff_name as staffName,
t2.staff_no as staffNo,
t3.dict_label as dictName,
- t4.dict_label as dictTypeName
+ t4.dict_label as dictTypeName,
+ t5.name as deptName
from labor_issue t1
left join staff_join_leave_record t2 on t1.staff_id = t2.id
left join sys_dict_data t3 on t1.dict_id = t3.dict_value
left join sys_dict_data t4 on t1.dict_type = t4.dict_value
+ left join dept_position t5 on t1.dept_position_id = t5.id
<where>
<if test="req.season != null and req.season != ''">
and (t1.issue_date >= #{req.startDate} and t1.issue_date <= #{req.endDate})
@@ -43,11 +45,13 @@
t2.staff_name as staffName,
t2.staff_no as staffNo,
t3.dict_label as dictName,
- t4.dict_label as dictTypeName
+ t4.dict_label as dictTypeName,
+ t5.name as deptName
from labor_issue t1
left join staff_join_leave_record t2 on t1.staff_id = t2.id
left join sys_dict_data t3 on t1.dict_id = t3.dict_value
left join sys_dict_data t4 on t1.dict_type = t4.dict_value
+ left join dept_position t5 on t1.dept_position_id = t5.id
<where>
<if test="req.adoptedDate != null">
and t1.adopted_date is null
--
Gitblit v1.9.3