From 35cfaa7259f3d494e7bd03aec5c7e035049ee19b Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期三, 24 九月 2025 19:34:09 +0800
Subject: [PATCH] feat: 新增社保档位提醒功能
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 8602721..b4d6284 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>
@@ -185,7 +185,7 @@
<select id="countDqhtBaseInfoList" resultType="java.lang.Integer">
SELECT
- count(IF(t2.contractStatus = 1, 1, NULL)) dqht
+ count(IF(t2.contractStatus in('1','2'), 1, NULL)) dqht
FROM
t_emp_baseinfo t INNER JOIN t_emp_contractinfo 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>
@@ -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())
@@ -785,7 +785,7 @@
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 and t1.contractStatus = '4' and t1.empStatus=0
+ </foreach> and t.delFlag=0 and t1.delFlag=0 and t1.contractStatus in( '1','2') and t1.empStatus=0
<if test="name!= 'undefined' and name!=null and name!=''">
and (t.empNumb like CONCAT('%',#{name},'%') or t.empName like CONCAT('%',#{name},'%') or
t.certificateNumb like CONCAT('%',#{name},'%') or t2.DEPT_NAME like CONCAT('%',#{name},'%'))
@@ -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
--
Gitblit v1.8.0