From 2a192abbbca7adce3571ed4a9f4f94b847ff8c94 Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期六, 11 四月 2026 20:38:00 +0800
Subject: [PATCH] refactor(hr): 重构员工基本信息导入逻辑提升代码可维护性
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpContractInfoMapper.xml | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpContractInfoMapper.xml b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpContractInfoMapper.xml
index 93e93c7..309b0e3 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpContractInfoMapper.xml
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpContractInfoMapper.xml
@@ -3,10 +3,42 @@
<mapper namespace="cc.mrbird.febs.server.hr.mapper.EmpContractInfoMapper">
<select id="selectPageVo" resultType="cc.mrbird.febs.server.hr.entity.EmpContractInfo">
- select a.* from t_emp_contractinfo a
+ select a.*,b.allDeptName from t_emp_contractinfo 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="selectUnionPageVo" resultType="cc.mrbird.febs.server.hr.entity.EmpContractInfo">
+ SELECT * FROM (
+ (SELECT a.*, b.allDeptName
+ FROM t_emp_contractinfo a
+ INNER JOIN t_emp_baseinfo b ON a.empId = b.empId
+ INNER JOIN t_dept c ON b.deptId = c.DEPT_ID
+ <where>
+ ${sqlSegment1}
+ </where>)
+ UNION
+
+ (SELECT a.*, b.allDeptName
+ FROM t_emp_contractinfo a
+ INNER JOIN t_emp_baseinfo b ON a.empId = b.empId
+ INNER JOIN t_dept c ON b.deptId = c.DEPT_ID
+ <where>
+ ${sqlSegment2}
+ </where>)
+ ) t
+ ORDER BY diffDay ASC
+ </select>
+
+ <select id="selectLastContractPageVo" resultType="cc.mrbird.febs.server.hr.entity.EmpContractInfo">
+ SELECT a.*, b.allDeptName
+ FROM t_emp_contractinfo a
+ INNER JOIN t_emp_baseinfo b ON a.empId = b.empId
+ INNER JOIN t_dept c ON b.deptId = c.DEPT_ID
+ <where>
+ ${sqlSegment}
+ </where>
+ ORDER BY a.diffDay DESC
+ </select>
</mapper>
--
Gitblit v1.8.0