From 89ba4125856330a78425bc921530bde9dc6d8606 Mon Sep 17 00:00:00 2001
From: autumnal_wind@yeah.net <autumnal_wind@yeah.net>
Date: 星期四, 18 四月 2024 16:22:55 +0800
Subject: [PATCH] feat: 合同增加时写入了到期天数
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 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 f3458ed..b22df99 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
@@ -185,7 +185,7 @@
<select id="countDqhtBaseInfoList" resultType="java.lang.Integer">
SELECT
- count(IF(t2.contractStatus = 4, 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>
@@ -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'
+ </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},'%'))
--
Gitblit v1.8.0