From 4e55bd9cee8e44f7a7a0d9185d8323fc7be9193d Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期六, 11 四月 2026 21:14:01 +0800
Subject: [PATCH] fix(hr): 修正员工基础信息字典字段的大小写问题
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpContractInfoMapper.xml | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 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 e7789ae..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
@@ -2,4 +2,43 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cc.mrbird.febs.server.hr.mapper.EmpContractInfoMapper">
+ <select id="selectPageVo" 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
+ ${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