From d3dad0dc820d7baf365cc10288fdb5094a7babfa Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期四, 19 三月 2026 10:32:41 +0800
Subject: [PATCH] fix(hr): 修复员工信息导入时身份证有效期设置问题
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml
index b22df99..a4c970c 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml
@@ -7,12 +7,12 @@
</select>
<select id="selectPageVo" resultType="cc.mrbird.febs.server.hr.entity.EmpBaseInfo">
- select a.* from t_emp_baseInfo a
+ select a.* from t_emp_baseinfo a
inner join t_dept c on a.deptId = c.DEPT_ID
${ew.customSqlSegment}
</select>
<select id="listAll" resultType="cc.mrbird.febs.server.hr.entity.EmpBaseInfo">
- select a.* from t_emp_baseInfo a
+ select a.* from t_emp_baseinfo a
inner join t_dept c on a.deptId = c.DEPT_ID
${ew.customSqlSegment}
</select>
@@ -431,7 +431,7 @@
SELECT
count(1) ygtg
FROM
- t_emp_baseinfo t right JOIN t_emp_jobChange t2 on t.empId=t2.empId inner join t_dept t1 on t.deptId=t1.DEPT_ID ${ew.customSqlSegment} and t.delFlag=0 and t2.delFlag=0
+ t_emp_baseinfo t right JOIN t_emp_jobchange t2 on t.empId=t2.empId inner join t_dept t1 on t.deptId=t1.DEPT_ID ${ew.customSqlSegment} and t.delFlag=0 and t2.delFlag=0
<choose>
<when test="index==0">
and TO_DAYS(t2.changeDate) = TO_DAYS(NOW())
@@ -1148,7 +1148,7 @@
SELECT
t1.*,t.empNumb,t.deptName,t.certificateNumb,t.allDeptName
FROM
- t_emp_baseinfo t right JOIN t_emp_jobChange t1 on t.empId=t1.empId inner join t_dept t2 on t.deptId=t2.DEPT_ID where 1=1 and t2.DEPT_ID in
+ t_emp_baseinfo t right JOIN t_emp_jobchange t1 on t.empId=t1.empId inner join t_dept t2 on t.deptId=t2.DEPT_ID where 1=1 and t2.DEPT_ID in
<foreach item="item" index="index" collection="list" open="(" separator="," close=")">
#{item}
</foreach> and t.delFlag=0 and t1.delFlag=0
@@ -1175,4 +1175,8 @@
</choose>
</select>
+ <select id="selectAlertCount" resultType="java.lang.Long">
+ SELECT COUNT(*) FROM t_emp_baseinfo a
+ ${ew.customSqlSegment}
+ </select>
</mapper>
--
Gitblit v1.8.0