From 44e0f0472d8efa0646b20db8a40c16beab0b752e Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期六, 06 四月 2024 12:22:12 +0800
Subject: [PATCH] feat: 一些需求改进 打开档案时增加了部门选择项 处理了合同信息录入时的性别不自动填入问题 合同到期提醒模块发布
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpJobChangeMapper.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpJobChangeMapper.xml b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpJobChangeMapper.xml
index bb0ee06..627c793 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpJobChangeMapper.xml
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpJobChangeMapper.xml
@@ -3,8 +3,14 @@
<mapper namespace="cc.mrbird.febs.server.hr.mapper.EmpJobChangeMapper">
<select id="selectPageVo" resultType="java.util.Map">
- select a.*,b.empNumb,b.certificateNumb from t_emp_jobchange a
- inner join t_emp_baseinfo b on a.empId = b.empId
+ select a.*,b.empNumb,b.certificateNumb,c.allDeptName from t_emp_jobchange a
+ inner join t_emp_baseinfo b on a.empId = b.empId
+ inner join t_dept c on b.deptId = c.DEPT_ID
+ ${ew.customSqlSegment}
+ </select>
+ <select id="selectPageVoBean" resultType="cc.mrbird.febs.server.hr.entity.EmpJobChange">
+ select a.*,b.empNumb,b.certificateNumb,c.allDeptName from t_emp_jobchange a
+ inner join t_emp_baseinfo b on a.empId = b.empId
inner join t_dept c on b.deptId = c.DEPT_ID
${ew.customSqlSegment}
</select>
--
Gitblit v1.8.0