From eb75ecc4eacb90f786ddf2e64c00547496345eeb Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期日, 07 三月 2021 14:41:58 +0800
Subject: [PATCH] 提交
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml | 334 ++++++++++++++++++++++++++-----------------------------
1 files changed, 158 insertions(+), 176 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 0f76dd6..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
@@ -3,32 +3,34 @@
<mapper namespace="cc.mrbird.febs.server.hr.mapper.EmpBaseInfoMapper">
<select id="sysConfig" resultType="cc.mrbird.febs.common.core.entity.system.SysConfig">
- select * from sys_config where config_key in ("manOld","womanOld") ORDER BY config_key asc
+ 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="countBaseInfoList" resultType="java.util.Map">
+ <select id="countZcygBaseInfoList" resultType="java.util.Map">
SELECT
- count(IF(t.empStatus = 0, 1, NULL)) zzyg,
- count(IF(t.empType = '1', 1, NULL)) zsyg,
- count(IF(t.empType = '2', 1, NULL)) lsyg,
- count(
- IF (t.dimissionType = '1', 1, NULL)
- ) zclz,
- count(
- IF (t.dimissionType = '2', 1, NULL)
- ) zdlz,
- count(
- IF (t.dimissionType = '4', 1, NULL)
- ) gsct,
- count( if(t.sex is not null and t.age !=0 and t.sex=1 and t.age>=${manOld},1,null))+count( if(t.sex is not null and t.age !=0 and t.sex=2 and t.age>=${womanOld},1,null)) clyg
+ count(
+ IF (t.dimissionType = '1', 1, NULL)
+ ) zclz,
+ count(
+ IF (t.dimissionType = '2', 1, NULL)
+ ) zdlz,
+ count(
+ IF (t.dimissionType = '4', 1, NULL)
+ ) gsct
FROM
- t_emp_baseinfo t where 1=1
+ t_emp_baseinfo t where 1=1 and t.delFlag=0 and t.empStatus='1'
<choose>
<when test="btime!=null and btime!='' and etime!=null and etime!=''">
and date_format(t.createTime,'%Y-%m-%d') >= #{btime} and date_format(t.createTime,'%Y-%m-%d') <= #{etime}
</when>
<when test="index==0">
- and TO_DAYS(t.createTime) = TO_DAYS(NOW())
+ and TO_DAYS(t.createTime) = TO_DAYS(NOW())
</when>
<when test="index==1">
and YEARWEEK(date_format(t.createTime,'%Y-%m-%d')) = YEARWEEK(now())
@@ -40,6 +42,16 @@
and YEAR(t.createTime)=YEAR(NOW())
</otherwise>
</choose>
+
+ </select>
+ <select id="countBaseInfoList" resultType="java.util.Map">
+ SELECT
+ count(1) zzyg,
+ count(IF(t.empType = '1', 1, NULL)) zsyg,
+ count(IF(t.empType = '2', 1, NULL)) lsyg,
+ count( if(t.sex is not null and t.age !=0 and t.sex=1 and t.age>=${manOld},1,null))+count( if(t.sex is not null and t.age !=0 and t.sex=2 and t.age>=${womanOld},1,null)) clyg
+ FROM
+ t_emp_baseinfo t where 1=1 and t.delFlag=0 and t.empStatus = 0
</select>
@@ -47,7 +59,7 @@
SELECT
count(1) xjyg
FROM
- t_emp_baseinfo t where 1=1
+ t_emp_baseinfo t where 1=1 and t.delFlag=0
<choose>
<when test="btime!=null and btime!='' and etime!=null and etime!=''">
and date_format(t.entryDate,'%Y-%m-%d') >= #{btime} and date_format(t.entryDate,'%Y-%m-%d') <= #{etime}
@@ -68,10 +80,10 @@
</select>
<select id="countLzygBaseInfoList" resultType="java.util.Map">
SELECT
- count(1) lzyg,count(IF(t1.contractStatus = 3, 1, NULL)) jcht
+ count(IF(t1.contractStatus = 3, 1, NULL)) jcht
FROM
- t_emp_baseinfo t left JOIN t_emp_contractinfo t1 on t.empId=t1.empId where 1=1
+ t_emp_baseinfo t left 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(t.dimissionDate,'%Y-%m-%d') >= #{btime} and date_format(t.dimissionDate,'%Y-%m-%d') <= #{etime}
@@ -94,7 +106,7 @@
SELECT
count(1) czyg
FROM
- t_emp_baseinfo t INNER JOIN t_emp_resign t1 on t.empId=t1.empId where 1=1
+ t_emp_baseinfo t INNER JOIN t_emp_resign 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.applayDate,'%Y-%m-%d') >= #{btime} and date_format(t1.applayDate,'%Y-%m-%d') <= #{etime}
@@ -114,14 +126,38 @@
</choose>
</select>
- <select id="countYxhtBaseInfoList" resultType="java.util.Map">
+ <select id="countXqhtBaseInfoList" resultType="java.util.Map">
SELECT
- count(IF(t1.contractStatus = 1 or t1.contractStatus = 2, 1, NULL)) yxht,
count(IF(t1.contractStatus = 1, 1, NULL)) xinqht,
count(IF(t1.contractStatus = 2, 1, NULL)) xqht
FROM
- t_emp_baseinfo t INNER JOIN t_emp_contractinfo t1 on t.empId=t1.empId where 1=1
+ 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>
+ <select id="countYxhtBaseInfoList" resultType="java.util.Map">
+ SELECT
+ 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}
@@ -146,7 +182,7 @@
SELECT
count(IF(t1.contractStatus = 4, 1, NULL)) dqht
FROM
- t_emp_baseinfo t INNER JOIN t_emp_contractinfo t1 on t.empId=t1.empId where 1=1
+ 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.endDate,'%Y-%m-%d') >= #{btime} and date_format(t1.endDate,'%Y-%m-%d') <= #{etime}
@@ -173,7 +209,7 @@
,count(IF(t1.absenteeism !=0 , 1, NULL)) ygkg
FROM
- t_emp_baseinfo t right JOIN t_emp_dimissionattend t1 on t.empId=t1.empId where 1=1
+ t_emp_baseinfo t right JOIN t_emp_dimissionattend 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 t1.attendMonth >= #{btime} and t1.attendMonth <= #{etime}
@@ -192,7 +228,7 @@
SELECT
count(1) ygqj
FROM
- t_emp_baseinfo t right JOIN t_emp_leaveinfo t1 on t.empId=t1.empId where 1=1
+ t_emp_baseinfo t right JOIN t_emp_leaveinfo 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.returnDate,'%Y-%m-%d') >= #{btime} and date_format(t1.returnDate,'%Y-%m-%d') <= #{etime}
@@ -225,7 +261,7 @@
SELECT
count(1) lzaj
FROM
- t_emp_baseinfo t right JOIN t_emp_labortrouble t1 on t.empId=t1.empId where 1=1
+ t_emp_baseinfo t right JOIN t_emp_labortrouble 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.arbitrationDate,'%Y-%m-%d') >= #{btime} and date_format(t1.arbitrationDate,'%Y-%m-%d') <= #{etime}
@@ -249,7 +285,7 @@
<select id="countGsajBaseInfoList" resultType="java.util.Map">
SELECT (SELECT count(1)
FROM
- t_emp_baseinfo t right JOIN t_emp_accidentcases t1 on t.empId=t1.empId where 1=1
+ t_emp_baseinfo t right JOIN t_emp_accidentcases 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.injuredTime,'%Y-%m-%d') >= #{btime} and date_format(t1.injuredTime,'%Y-%m-%d') <= #{etime}
@@ -270,7 +306,7 @@
SELECT
count(1)
FROM
- t_emp_baseinfo t right JOIN t_emp_occupational t1 on t.empId=t1.empId where 1=1
+ t_emp_baseinfo t right JOIN t_emp_occupational 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.injuredTime,'%Y-%m-%d') >= #{btime} and date_format(t1.injuredTime,'%Y-%m-%d') <= #{etime}
@@ -297,7 +333,7 @@
SELECT
count(1) sbsq
FROM
- t_emp_baseinfo t right JOIN t_emp_insurance t1 on t.empId=t1.empId where 1=1
+ t_emp_baseinfo t right JOIN t_emp_insurance 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.applayDate,'%Y-%m-%d') >= #{btime} and date_format(t1.applayDate,'%Y-%m-%d') <= #{etime}
@@ -320,7 +356,7 @@
SELECT
count(1) syj
FROM
- t_emp_baseinfo t right JOIN t_emp_unemployment t1 on t.empId=t1.empId where 1=1
+ t_emp_baseinfo t right JOIN t_emp_unemployment 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.applayDate,'%Y-%m-%d') >= #{btime} and date_format(t1.applayDate,'%Y-%m-%d') <= #{etime}
@@ -343,7 +379,7 @@
SELECT
count(1) ygtj
FROM
- t_emp_baseinfo t right JOIN t_emp_physicalexam t1 on t.empId=t1.empId where 1=1
+ t_emp_baseinfo t right JOIN t_emp_physicalexam 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.physicalExamDate,'%Y-%m-%d') >= #{btime} and date_format(t1.physicalExamDate,'%Y-%m-%d') <= #{etime}
@@ -366,22 +402,22 @@
SELECT
count(1) sfz
FROM
- t_emp_baseinfo t where 1=1
+ 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>
@@ -390,7 +426,7 @@
SELECT
count(1) ygtg
FROM
- t_emp_baseinfo t right JOIN t_emp_jobChange t1 on t.empId=t1.empId where 1=1
+ 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
<choose>
<when test="index==0">
and TO_DAYS(t1.changeDate) = TO_DAYS(NOW())
@@ -411,7 +447,7 @@
SELECT
count(1) bljl
FROM
- t_emp_baseinfo t right JOIN t_emp_badrecord t1 on t.empId=t1.empId where 1=1
+ t_emp_baseinfo t right JOIN t_emp_badrecord 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.badDate,'%Y-%m-%d') >= #{btime} and date_format(t1.badDate,'%Y-%m-%d') <= #{etime}
@@ -434,29 +470,11 @@
<select id="zzbaseInfoList" 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 empStatus=0
+ select t1.* from t_emp_baseinfo t1 left join t_dept t2 on t1.deptId=t2.DEPT_ID where t1.empStatus=0 and t1.delFlag=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},'%'))
</if>
- <choose>
- <when test="btime!='undefined' and btime!=null and btime!='' and etime!='undefined' and etime!=null and etime!=''">
- and date_format(t1.createTime,'%Y-%m-%d') >= #{btime} and date_format(t1.createTime,'%Y-%m-%d') <= #{etime}
- </when>
- <when test="index==0">
- and TO_DAYS(t1.createTime) = TO_DAYS(NOW())
- </when>
- <when test="index==1">
- and YEARWEEK(date_format(t1.createTime,'%Y-%m-%d')) = YEARWEEK(now())
- </when>
- <when test="index==2">
- and date_format(t1.createTime,'%Y-%m') = date_format(now(),'%Y-%m')
- </when>
- <otherwise>
- and YEAR(t1.createTime)=YEAR(NOW())
- </otherwise>
- </choose>
-
</select>
<select id="clbaseInfoList" resultType="cc.mrbird.febs.server.hr.entity.EmpBaseInfo">
@@ -464,42 +482,24 @@
SELECT
t.*
FROM
- t_emp_baseinfo t left join t_dept t2 on t.deptId=t2.DEPT_ID where 1=1 and t.sex is not null and t.age !=0 and t.sex=1 and t.age>=${manOld}
+ t_emp_baseinfo t left join t_dept t2 on t.deptId=t2.DEPT_ID where 1=1 and t.empStatus = 0 and t.delFlag=0 and t.sex is not null and t.age !=0 and t.sex=1 and t.age>=${manOld}
UNION
SELECT
t.*
FROM
- t_emp_baseinfo t left join t_dept t2 on t.deptId=t2.DEPT_ID where 1=1 and t.sex is not null and t.age !=0 and t.sex=2 and t.age>=${womanOld}
+ t_emp_baseinfo t left join t_dept t2 on t.deptId=t2.DEPT_ID where 1=1 and t.empStatus = 0 and t.delFlag=0 and t.sex is not null and t.age !=0 and t.sex=2 and t.age>=${womanOld}
) t1 where 1=1
<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},'%'))
</if>
- <choose>
- <when test="btime!='undefined' and btime!=null and btime!='' and etime!='undefined' and etime!=null and etime!=''">
- and date_format(t1.createTime,'%Y-%m-%d') >= #{btime} and date_format(t1.createTime,'%Y-%m-%d') <= #{etime}
- </when>
- <when test="index==0">
- and TO_DAYS(t1.createTime) = TO_DAYS(NOW())
- </when>
- <when test="index==1">
- and YEARWEEK(date_format(t1.createTime,'%Y-%m-%d')) = YEARWEEK(now())
- </when>
- <when test="index==2">
- and date_format(t1.createTime,'%Y-%m') = date_format(now(),'%Y-%m')
- </when>
- <otherwise>
- and YEAR(t1.createTime)=YEAR(NOW())
- </otherwise>
- </choose>
-
</select>
<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
+ 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},'%'))
@@ -509,22 +509,22 @@
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>
</select>
<select id="xjbaseInfoList" 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
+ 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
<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},'%'))
@@ -552,83 +552,29 @@
<select id="zsbaseInfoList" 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 empType='1'
+ select t1.* from t_emp_baseinfo t1 left join t_dept t2 on t1.deptId=t2.DEPT_ID where t1.empType='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},'%'))
</if>
- <choose>
- <when test="btime!='undefined' and btime!=null and btime!='' and etime!='undefined' and etime!=null and etime!=''">
- and date_format(t1.createTime,'%Y-%m-%d') >= #{btime} and date_format(t1.createTime,'%Y-%m-%d') <= #{etime}
- </when>
- <when test="index==0">
- and TO_DAYS(t1.createTime) = TO_DAYS(NOW())
- </when>
- <when test="index==1">
- and YEARWEEK(date_format(t1.createTime,'%Y-%m-%d')) = YEARWEEK(now())
- </when>
- <when test="index==2">
- and date_format(t1.createTime,'%Y-%m') = date_format(now(),'%Y-%m')
- </when>
- <otherwise>
- and YEAR(t1.createTime)=YEAR(NOW())
- </otherwise>
- </choose>
-
</select>
<select id="lsbaseInfoList" 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 empType='2'
+ select t1.* from t_emp_baseinfo t1 left join t_dept t2 on t1.deptId=t2.DEPT_ID where t1.empType='2' 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},'%'))
</if>
- <choose>
- <when test="btime!='undefined' and btime!=null and btime!='' and etime!='undefined' and etime!=null and etime!=''">
- and date_format(t1.createTime,'%Y-%m-%d') >= #{btime} and date_format(t1.createTime,'%Y-%m-%d') <= #{etime}
- </when>
- <when test="index==0">
- and TO_DAYS(t1.createTime) = TO_DAYS(NOW())
- </when>
- <when test="index==1">
- and YEARWEEK(date_format(t1.createTime,'%Y-%m-%d')) = YEARWEEK(now())
- </when>
- <when test="index==2">
- and date_format(t1.createTime,'%Y-%m') = date_format(now(),'%Y-%m')
- </when>
- <otherwise>
- and YEAR(t1.createTime)=YEAR(NOW())
- </otherwise>
- </choose>
-
</select>
<select id="lzbaseInfoList" 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
+ 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=1
<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},'%'))
</if>
- <choose>
- <when test="btime!='undefined' and btime!=null and btime!='' and etime!='undefined' and etime!=null and etime!=''">
- and date_format(t1.dimissionDate,'%Y-%m-%d') >= #{btime} and date_format(t1.dimissionDate,'%Y-%m-%d') <= #{etime}
- </when>
- <when test="index==0">
- and TO_DAYS(t1.dimissionDate) = TO_DAYS(NOW())
- </when>
- <when test="index==1">
- and YEARWEEK(date_format(t1.dimissionDate,'%Y-%m-%d')) = YEARWEEK(now())
- </when>
- <when test="index==2">
- and date_format(t1.dimissionDate,'%Y-%m') = date_format(now(),'%Y-%m')
- </when>
- <otherwise>
- and YEAR(t1.dimissionDate)=YEAR(NOW())
- </otherwise>
- </choose>
-
</select>
@@ -637,7 +583,7 @@
SELECT
t.*,t1.applayDate,t1.reason,t1.reporter
FROM
- t_emp_baseinfo t INNER JOIN t_emp_resign t1 on t.empId=t1.empId left join t_dept t2 on t.deptId=t2.DEPT_ID where 1=1
+ t_emp_baseinfo t INNER JOIN t_emp_resign t1 on t.empId=t1.empId left join t_dept t2 on t.deptId=t2.DEPT_ID where 1=1 and t.delFlag=0 and t1.delFlag=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},'%'))
@@ -664,7 +610,7 @@
<select id="zcbaseInfoList" 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
+ 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='1'
<choose>
<when test="number==8">
and t1.dimissionType = '1'
@@ -705,39 +651,74 @@
<select id="yxbaseInfoList" resultType="cc.mrbird.febs.server.hr.entity.EmpBaseInfo">
- select t1.* from t_emp_baseinfo t left join t_dept t2 on t.deptId=t2.DEPT_ID INNER JOIN t_emp_contractinfo t1 on t.empId=t1.empId where 1=1
+ select t1.* from t_emp_baseinfo t left join t_dept t2 on t.deptId=t2.DEPT_ID 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="number==14">
and 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>
</when>
<when test="number==13">
and t1.contractStatus = '1'
+ <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>
</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!=''">
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},'%'))
</if>
- <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>
+
</select>
@@ -747,7 +728,7 @@
SELECT
t1.*
FROM
- t_emp_baseinfo t INNER JOIN t_emp_contractinfo t1 on t.empId=t1.empId left join t_dept t2 on t.deptId=t2.DEPT_ID where 1=1 and t1.contractStatus = '4'
+ t_emp_baseinfo t INNER JOIN t_emp_contractinfo t1 on t.empId=t1.empId left join t_dept t2 on t.deptId=t2.DEPT_ID where 1=1 and t.delFlag=0 and t1.delFlag=0 and t1.contractStatus = '4'
<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},'%'))
@@ -775,7 +756,7 @@
SELECT
t1.*
FROM
- t_emp_baseinfo t INNER JOIN t_emp_contractinfo t1 on t.empId=t1.empId left join t_dept t2 on t.deptId=t2.DEPT_ID where 1=1 and t1.contractStatus = '3'
+ t_emp_baseinfo t INNER JOIN t_emp_contractinfo t1 on t.empId=t1.empId left join t_dept t2 on t.deptId=t2.DEPT_ID where 1=1 and t.delFlag=0 and t1.delFlag=0 and t1.contractStatus = '3'
<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},'%'))
@@ -803,7 +784,7 @@
SELECT
t1.*
FROM
- t_emp_baseinfo t right JOIN t_emp_dimissionattend t1 on t.empId=t1.empId left join t_dept t2 on t.deptId=t2.DEPT_ID where 1=1
+ t_emp_baseinfo t right JOIN t_emp_dimissionattend t1 on t.empId=t1.empId left join t_dept t2 on t.deptId=t2.DEPT_ID where 1=1 and t.delFlag=0 and t1.delFlag=0
<choose>
<when test="number==3">
and t1.absenteeism !=0
@@ -839,7 +820,7 @@
SELECT
t1.*
FROM
- t_emp_baseinfo t right JOIN t_emp_leaveinfo t1 on t.empId=t1.empId where 1=1
+ t_emp_baseinfo t right JOIN t_emp_leaveinfo 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.empNumb like CONCAT('%',#{name},'%') or t1.empName like CONCAT('%',#{name},'%') or
t1.certificateNumb like CONCAT('%',#{name},'%') or t1.deptName like CONCAT('%',#{name},'%'))
@@ -868,7 +849,7 @@
SELECT
t1.*
FROM
- t_emp_baseinfo t right JOIN t_emp_physicalexam t1 on t.empId=t1.empId where 1=1
+ t_emp_baseinfo t right JOIN t_emp_physicalexam 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.empNumb like CONCAT('%',#{name},'%') or t1.empName like CONCAT('%',#{name},'%') or
t1.certificateNumb like CONCAT('%',#{name},'%') or t1.deptName like CONCAT('%',#{name},'%'))
@@ -900,7 +881,7 @@
SELECT
t1.*
FROM
- t_emp_baseinfo t right JOIN t_emp_labortrouble t1 on t.empId=t1.empId where 1=1
+ t_emp_baseinfo t right JOIN t_emp_labortrouble 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.empNumb like CONCAT('%',#{name},'%') or t1.empName like CONCAT('%',#{name},'%') or
t1.certificateNumb like CONCAT('%',#{name},'%') or t1.deptName like CONCAT('%',#{name},'%'))
@@ -931,7 +912,7 @@
SELECT
t1.*
FROM
- t_emp_baseinfo t right JOIN t_emp_occupational t1 on t.empId=t1.empId where 1=1
+ t_emp_baseinfo t right JOIN t_emp_occupational 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.empNumb like CONCAT('%',#{name},'%') or t1.empName like CONCAT('%',#{name},'%') or
t1.certificateNumb like CONCAT('%',#{name},'%') or t1.deptName like CONCAT('%',#{name},'%'))
@@ -960,7 +941,7 @@
SELECT
t1.*
FROM
- t_emp_baseinfo t right JOIN t_emp_accidentcases t1 on t.empId=t1.empId where 1=1
+ t_emp_baseinfo t right JOIN t_emp_accidentcases 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.empNumb like CONCAT('%',#{name},'%') or t1.empName like CONCAT('%',#{name},'%') or
t1.certificateNumb like CONCAT('%',#{name},'%') or t1.deptName like CONCAT('%',#{name},'%'))
@@ -990,7 +971,7 @@
SELECT
t1.*
FROM
- t_emp_baseinfo t right JOIN t_emp_insurance t1 on t.empId=t1.empId where 1=1
+ t_emp_baseinfo t right JOIN t_emp_insurance 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.empNumb like CONCAT('%',#{name},'%') or t1.empName like CONCAT('%',#{name},'%') or
t1.certificateNumb like CONCAT('%',#{name},'%') or t1.deptName like CONCAT('%',#{name},'%'))
@@ -1020,7 +1001,7 @@
SELECT
t1.*
FROM
- t_emp_baseinfo t right JOIN t_emp_unemployment t1 on t.empId=t1.empId where 1=1
+ t_emp_baseinfo t right JOIN t_emp_unemployment 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.empNumb like CONCAT('%',#{name},'%') or t1.empName like CONCAT('%',#{name},'%') or
t1.certificateNumb like CONCAT('%',#{name},'%') or t1.deptName like CONCAT('%',#{name},'%'))
@@ -1049,7 +1030,7 @@
SELECT
t1.*
FROM
- t_emp_baseinfo t right JOIN t_emp_badrecord t1 on t.empId=t1.empId where 1=1
+ t_emp_baseinfo t right JOIN t_emp_badrecord 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.empNumb like CONCAT('%',#{name},'%') or t1.empName like CONCAT('%',#{name},'%') or
t1.certificateNumb like CONCAT('%',#{name},'%') or t1.deptName like CONCAT('%',#{name},'%'))
@@ -1077,11 +1058,12 @@
<select id="empBaseInfoTgList" resultType="cc.mrbird.febs.server.hr.entity.EmpJobChange">
SELECT
- t1.*
+ 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
+ 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