From 890be4f01daefbca6f085bb8314d40de282c1db8 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期五, 05 三月 2021 15:52:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml | 66 +++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 12 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 38d780f..958b05e 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
@@ -5,6 +5,12 @@
<select id="sysConfig" resultType="cc.mrbird.febs.common.core.entity.system.SysConfig">
select * from sys_config where delFlag='0' and config_key in ("manOld","womanOld") ORDER BY config_key asc
</select>
+
+ <select id="selectPageVo" resultType="cc.mrbird.febs.server.hr.entity.EmpBaseInfo">
+ select a.* from t_emp_baseInfo a
+ inner join t_dept c on a.deptId = c.DEPT_ID
+ ${ew.customSqlSegment}
+ </select>
<select id="countZcygBaseInfoList" resultType="java.util.Map">
SELECT
@@ -151,6 +157,24 @@
count(IF(t1.contractStatus = 1 or t1.contractStatus = 2, 1, NULL)) yxht
FROM
t_emp_baseinfo t INNER JOIN t_emp_contractinfo t1 on t.empId=t1.empId where 1=1 and t.delFlag=0 and t1.delFlag=0
+
+ <choose>
+ <when test="btime!=null and btime!='' and etime!=null and etime!=''">
+ and date_format(t1.signingDate,'%Y-%m-%d') >= #{btime} and date_format(t1.signingDate,'%Y-%m-%d') <= #{etime}
+ </when>
+ <when test="index==0">
+ and TO_DAYS(t1.signingDate) = TO_DAYS(NOW())
+ </when>
+ <when test="index==1">
+ and YEARWEEK(date_format(t1.signingDate,'%Y-%m-%d')) = YEARWEEK(now())
+ </when>
+ <when test="index==2">
+ and date_format(t1.signingDate,'%Y-%m') = date_format(now(),'%Y-%m')
+ </when>
+ <otherwise>
+ and YEAR(t1.signingDate)=YEAR(NOW())
+ </otherwise>
+ </choose>
</select>
@@ -378,22 +402,22 @@
SELECT
count(1) sfz
FROM
- t_emp_baseinfo t where 1=1 and t.delFlag=0
+ t_emp_baseinfo t where 1=1 and t.delFlag=0 and t.empStatus=0
<choose>
<when test="btime!=null and btime!='' and etime!=null and etime!=''">
and date_format(t.certificateValidity,'%Y-%m-%d') >= #{btime} and date_format(t.certificateValidity,'%Y-%m-%d') <= #{etime}
</when>
<when test="index==0">
- and TO_DAYS(t.certificateValidity) = TO_DAYS(NOW())
+ and TO_DAYS(t.certificateValidity) <= TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t.certificateValidity,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t.certificateValidity,'%Y-%m-%d')) <= YEARWEEK(now())
</when>
<when test="index==2">
- and date_format(t.certificateValidity,'%Y-%m') = date_format(now(),'%Y-%m')
+ and date_format(t.certificateValidity,'%Y-%m') <= date_format(now(),'%Y-%m')
</when>
<otherwise>
- and YEAR(t.certificateValidity)=YEAR(NOW())
+ and YEAR(t.certificateValidity)<=YEAR(NOW())
</otherwise>
</choose>
</select>
@@ -475,7 +499,7 @@
<select id="sfzbaseInfoList" resultType="cc.mrbird.febs.server.hr.entity.EmpBaseInfo">
- select t1.* from t_emp_baseinfo t1 left join t_dept t2 on t1.deptId=t2.DEPT_ID where 1=1 and t1.delFlag=0
+ select t1.* from t_emp_baseinfo t1 left join t_dept t2 on t1.deptId=t2.DEPT_ID where 1=1 and t1.delFlag=0 and t1.empStatus=0
<if test="name!= 'undefined' and name!=null and name!=''">
and (t1.empNumb like CONCAT('%',#{name},'%') or t1.empName like CONCAT('%',#{name},'%') or
t1.certificateNumb like CONCAT('%',#{name},'%') or t2.DEPT_NAME like CONCAT('%',#{name},'%'))
@@ -485,16 +509,16 @@
and date_format(t1.certificateValidity,'%Y-%m-%d') >= #{btime} and date_format(t1.certificateValidity,'%Y-%m-%d') <= #{etime}
</when>
<when test="index==0">
- and TO_DAYS(t1.certificateValidity) = TO_DAYS(NOW())
+ and TO_DAYS(t1.certificateValidity) <= TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t1.certificateValidity,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t1.certificateValidity,'%Y-%m-%d')) <= YEARWEEK(now())
</when>
<when test="index==2">
- and date_format(t1.certificateValidity,'%Y-%m') = date_format(now(),'%Y-%m')
+ and date_format(t1.certificateValidity,'%Y-%m') <= date_format(now(),'%Y-%m')
</when>
<otherwise>
- and YEAR(t1.certificateValidity)=YEAR(NOW())
+ and YEAR(t1.certificateValidity)<=YEAR(NOW())
</otherwise>
</choose>
@@ -671,6 +695,23 @@
</when>
<otherwise>
and (t1.contractStatus = '1' or t1.contractStatus = '2')
+ <choose>
+ <when test="btime!='undefined' and btime!=null and btime!='' and etime!='undefined' and etime!=null and etime!=''">
+ and date_format(t1.signingDate,'%Y-%m-%d') >= #{btime} and date_format(t1.signingDate,'%Y-%m-%d') <= #{etime}
+ </when>
+ <when test="index==0">
+ and TO_DAYS(t1.signingDate) = TO_DAYS(NOW())
+ </when>
+ <when test="index==1">
+ and YEARWEEK(date_format(t1.signingDate,'%Y-%m-%d')) = YEARWEEK(now())
+ </when>
+ <when test="index==2">
+ and date_format(t1.signingDate,'%Y-%m') = date_format(now(),'%Y-%m')
+ </when>
+ <otherwise>
+ and YEAR(t1.signingDate)=YEAR(NOW())
+ </otherwise>
+ </choose>
</otherwise>
</choose>
<if test="name!= 'undefined' and name!=null and name!=''">
@@ -1017,11 +1058,12 @@
<select id="empBaseInfoTgList" resultType="cc.mrbird.febs.server.hr.entity.EmpJobChange">
SELECT
- t1.*,t.certificateNumb
+ t1.*,t.empNumb,t.deptName,t.certificateNumb
FROM
t_emp_baseinfo t right JOIN t_emp_jobChange t1 on t.empId=t1.empId where 1=1 and t.delFlag=0 and t1.delFlag=0
<if test="name!= 'undefined' and name!=null and name!=''">
- and t1.empName like CONCAT('%',#{name},'%')
+ and (t.empNumb like CONCAT('%',#{name},'%') or t1.empName like CONCAT('%',#{name},'%') or
+ t.certificateNumb like CONCAT('%',#{name},'%') or t.deptName like CONCAT('%',#{name},'%'))
</if>
<choose>
<when test="btime!='undefined' and btime!=null and btime!='' and etime!='undefined' and etime!=null and etime!=''">
--
Gitblit v1.8.0