From e42bbb438b21ad7ef01888b7172ee5f810d2ab39 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期二, 06 四月 2021 01:42:57 +0800
Subject: [PATCH] fix(人力微服务): 修改前端，后端判断比较多，撤回上版本操作
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml | 341 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 216 insertions(+), 125 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 761fe27..2474f48 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
@@ -11,7 +11,11 @@
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
+ inner join t_dept c on a.deptId = c.DEPT_ID
+ ${ew.customSqlSegment}
+ </select>
<select id="countZcygBaseInfoList" resultType="java.util.Map">
SELECT
count(
@@ -24,7 +28,7 @@
IF (t.dimissionType = '4', 1, NULL)
) gsct
FROM
- t_emp_baseinfo t where 1=1 and t.delFlag=0 and t.empStatus='1'
+ t_emp_baseinfo t inner join t_dept t1 on t.deptId=t1.DEPT_ID ${ew.customSqlSegment} 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}
@@ -51,7 +55,8 @@
count(IF(t.empType = '02', 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
+ t_emp_baseinfo t inner join t_dept t1 on t.deptId=t1.DEPT_ID ${ew.customSqlSegment} and t.delFlag=0 and t.empStatus = 0
+
</select>
@@ -59,7 +64,7 @@
SELECT
count(1) xjyg
FROM
- t_emp_baseinfo t where 1=1 and t.delFlag=0
+ t_emp_baseinfo t inner join t_dept t1 on t.deptId=t1.DEPT_ID ${ew.customSqlSegment} 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}
@@ -80,10 +85,10 @@
</select>
<select id="countLzygBaseInfoList" resultType="java.util.Map">
SELECT
- count(IF(t1.contractStatus = 3, 1, NULL)) jcht
+ count(IF(t2.contractStatus = 3, 1, NULL)) jcht
FROM
- 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
+ t_emp_baseinfo t left 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>
<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}
@@ -106,73 +111,73 @@
SELECT
count(1) czyg
FROM
- 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
+ t_emp_baseinfo t INNER JOIN t_emp_resign 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="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}
+ and date_format(t2.applayDate,'%Y-%m-%d') >= #{btime} and date_format(t2.applayDate,'%Y-%m-%d') <= #{etime}
</when>
<when test="index==0">
- and TO_DAYS(t1.applayDate) = TO_DAYS(NOW())
+ and TO_DAYS(t2.applayDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t1.applayDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t2.applayDate,'%Y-%m-%d')) = YEARWEEK(now())
</when>
<when test="index==2">
- and date_format(t1.applayDate,'%Y-%m') = date_format(now(),'%Y-%m')
+ and date_format(t2.applayDate,'%Y-%m') = date_format(now(),'%Y-%m')
</when>
<otherwise>
- and YEAR(t1.applayDate)=YEAR(NOW())
+ and YEAR(t2.applayDate)=YEAR(NOW())
</otherwise>
</choose>
</select>
<select id="countXqhtBaseInfoList" resultType="java.util.Map">
SELECT
- count(IF(t1.contractStatus = 1, 1, NULL)) xinqht,
- count(IF(t1.contractStatus = 2, 1, NULL)) xqht
+ count(IF(t2.contractStatus = 1, 1, NULL)) xinqht,
+ count(IF(t2.contractStatus = 2, 1, NULL)) xqht
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
+ 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>
<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}
+ and date_format(t2.signingDate,'%Y-%m-%d') >= #{btime} and date_format(t2.signingDate,'%Y-%m-%d') <= #{etime}
</when>
<when test="index==0">
- and TO_DAYS(t1.signingDate) = TO_DAYS(NOW())
+ and TO_DAYS(t2.signingDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t1.signingDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t2.signingDate,'%Y-%m-%d')) = YEARWEEK(now())
</when>
<when test="index==2">
- and date_format(t1.signingDate,'%Y-%m') = date_format(now(),'%Y-%m')
+ and date_format(t2.signingDate,'%Y-%m') = date_format(now(),'%Y-%m')
</when>
<otherwise>
- and YEAR(t1.signingDate)=YEAR(NOW())
+ and YEAR(t2.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
+ count(IF(t2.contractStatus = 1 or t2.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
+ 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>
<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}
+ and date_format(t2.signingDate,'%Y-%m-%d') >= #{btime} and date_format(t2.signingDate,'%Y-%m-%d') <= #{etime}
</when>
<when test="index==0">
- and TO_DAYS(t1.signingDate) = TO_DAYS(NOW())
+ and TO_DAYS(t2.signingDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t1.signingDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t2.signingDate,'%Y-%m-%d')) = YEARWEEK(now())
</when>
<when test="index==2">
- and date_format(t1.signingDate,'%Y-%m') = date_format(now(),'%Y-%m')
+ and date_format(t2.signingDate,'%Y-%m') = date_format(now(),'%Y-%m')
</when>
<otherwise>
- and YEAR(t1.signingDate)=YEAR(NOW())
+ and YEAR(t2.signingDate)=YEAR(NOW())
</otherwise>
</choose>
</select>
@@ -180,24 +185,24 @@
<select id="countDqhtBaseInfoList" resultType="java.lang.Integer">
SELECT
- count(IF(t1.contractStatus = 4, 1, NULL)) dqht
+ count(IF(t2.contractStatus = 4, 1, NULL)) dqht
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
+ 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>
<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}
+ and date_format(t2.endDate,'%Y-%m-%d') >= #{btime} and date_format(t2.endDate,'%Y-%m-%d') <= #{etime}
</when>
<when test="index==0">
- and TO_DAYS(t1.endDate) = TO_DAYS(NOW())
+ and TO_DAYS(t2.endDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t1.endDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t2.endDate,'%Y-%m-%d')) = YEARWEEK(now())
</when>
<when test="index==2">
- and date_format(t1.endDate,'%Y-%m') = date_format(now(),'%Y-%m')
+ and date_format(t2.endDate,'%Y-%m') = date_format(now(),'%Y-%m')
</when>
<otherwise>
- and YEAR(t1.endDate)=YEAR(NOW())
+ and YEAR(t2.endDate)=YEAR(NOW())
</otherwise>
</choose>
</select>
@@ -205,20 +210,20 @@
<select id="countCqrsBaseInfoList" resultType="java.util.Map">
SELECT
- count(1) cqrs,count(IF(t1.overtimeDay!=0 or t1.overtimeHour!=0, 1, NULL)) ygjb
- ,count(IF(t1.absenteeism !=0 , 1, NULL)) ygkg
+ count(1) cqrs,count(IF(t2.overtimeDay!=0 or t2.overtimeHour!=0, 1, NULL)) ygjb
+ ,count(IF(t2.absenteeism !=0 , 1, NULL)) ygkg
FROM
- 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
+ t_emp_baseinfo t right JOIN t_emp_dimissionattend 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="btime!=null and btime!='' and etime!=null and etime!=''">
- and t1.attendMonth >= #{btime} and t1.attendMonth <= #{etime}
+ and t2.attendMonth >= #{btime} and t2.attendMonth <= #{etime}
</when>
<when test="index==2">
- and t1.attendMonth = date_format(now(),'%Y-%m')
+ and t2.attendMonth = date_format(now(),'%Y-%m')
</when>
<otherwise>
- and t1.attendMonth=YEAR(NOW())
+ and t2.attendMonth=YEAR(NOW())
</otherwise>
</choose>
</select>
@@ -228,22 +233,22 @@
SELECT
count(1) ygqj
FROM
- 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
+ t_emp_baseinfo t right JOIN t_emp_leaveinfo 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="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}
+ and date_format(t2.returnDate,'%Y-%m-%d') >= #{btime} and date_format(t2.returnDate,'%Y-%m-%d') <= #{etime}
</when>
<when test="index==0">
- and TO_DAYS(t1.returnDate) = TO_DAYS(NOW())
+ and TO_DAYS(t2.returnDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t1.returnDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t2.returnDate,'%Y-%m-%d')) = YEARWEEK(now())
</when>
<when test="index==2">
- and date_format(t1.returnDate,'%Y-%m') = date_format(now(),'%Y-%m')
+ and date_format(t2.returnDate,'%Y-%m') = date_format(now(),'%Y-%m')
</when>
<otherwise>
- and YEAR(t1.returnDate)=YEAR(NOW())
+ and YEAR(t2.returnDate)=YEAR(NOW())
</otherwise>
</choose>
</select>
@@ -261,22 +266,22 @@
SELECT
count(1) lzaj
FROM
- 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
+ t_emp_baseinfo t right JOIN t_emp_labortrouble 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="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}
+ and date_format(t2.arbitrationDate,'%Y-%m-%d') >= #{btime} and date_format(t2.arbitrationDate,'%Y-%m-%d') <= #{etime}
</when>
<when test="index==0">
- and TO_DAYS(t1.arbitrationDate) = TO_DAYS(NOW())
+ and TO_DAYS(t2.arbitrationDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t1.arbitrationDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t2.arbitrationDate,'%Y-%m-%d')) = YEARWEEK(now())
</when>
<when test="index==2">
- and date_format(t1.arbitrationDate,'%Y-%m') = date_format(now(),'%Y-%m')
+ and date_format(t2.arbitrationDate,'%Y-%m') = date_format(now(),'%Y-%m')
</when>
<otherwise>
- and YEAR(t1.arbitrationDate)=YEAR(NOW())
+ and YEAR(t2.arbitrationDate)=YEAR(NOW())
</otherwise>
</choose>
</select>
@@ -285,43 +290,43 @@
<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 and t.delFlag=0 and t1.delFlag=0
+ t_emp_baseinfo t right JOIN t_emp_accidentcases 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="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}
+ and date_format(t2.injuredTime,'%Y-%m-%d') >= #{btime} and date_format(t2.injuredTime,'%Y-%m-%d') <= #{etime}
</when>
<when test="index==0">
- and TO_DAYS(t1.injuredTime) = TO_DAYS(NOW())
+ and TO_DAYS(t2.injuredTime) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t1.injuredTime,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t2.injuredTime,'%Y-%m-%d')) = YEARWEEK(now())
</when>
<when test="index==2">
- and date_format(t1.injuredTime,'%Y-%m') = date_format(now(),'%Y-%m')
+ and date_format(t2.injuredTime,'%Y-%m') = date_format(now(),'%Y-%m')
</when>
<otherwise>
- and YEAR(t1.injuredTime)=YEAR(NOW())
+ and YEAR(t2.injuredTime)=YEAR(NOW())
</otherwise>
</choose>) ywxaj,(
SELECT
count(1)
FROM
- 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
+ t_emp_baseinfo t right JOIN t_emp_occupational 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="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}
+ and date_format(t2.injuredTime,'%Y-%m-%d') >= #{btime} and date_format(t2.injuredTime,'%Y-%m-%d') <= #{etime}
</when>
<when test="index==0">
- and TO_DAYS(t1.injuredTime) = TO_DAYS(NOW())
+ and TO_DAYS(t2.injuredTime) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t1.injuredTime,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t2.injuredTime,'%Y-%m-%d')) = YEARWEEK(now())
</when>
<when test="index==2">
- and date_format(t1.injuredTime,'%Y-%m') = date_format(now(),'%Y-%m')
+ and date_format(t2.injuredTime,'%Y-%m') = date_format(now(),'%Y-%m')
</when>
<otherwise>
- and YEAR(t1.injuredTime)=YEAR(NOW())
+ and YEAR(t2.injuredTime)=YEAR(NOW())
</otherwise>
</choose>) gsaj
@@ -333,22 +338,22 @@
SELECT
count(1) sbsq
FROM
- 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
+ t_emp_baseinfo t right JOIN t_emp_insurance 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="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}
+ and date_format(t2.applayDate,'%Y-%m-%d') >= #{btime} and date_format(t2.applayDate,'%Y-%m-%d') <= #{etime}
</when>
<when test="index==0">
- and TO_DAYS(t1.applayDate) = TO_DAYS(NOW())
+ and TO_DAYS(t2.applayDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t1.applayDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t2.applayDate,'%Y-%m-%d')) = YEARWEEK(now())
</when>
<when test="index==2">
- and date_format(t1.applayDate,'%Y-%m') = date_format(now(),'%Y-%m')
+ and date_format(t2.applayDate,'%Y-%m') = date_format(now(),'%Y-%m')
</when>
<otherwise>
- and YEAR(t1.applayDate)=YEAR(NOW())
+ and YEAR(t2.applayDate)=YEAR(NOW())
</otherwise>
</choose>
</select>
@@ -356,22 +361,22 @@
SELECT
count(1) syj
FROM
- 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
+ t_emp_baseinfo t right JOIN t_emp_unemployment 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="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}
+ and date_format(t2.applayDate,'%Y-%m-%d') >= #{btime} and date_format(t2.applayDate,'%Y-%m-%d') <= #{etime}
</when>
<when test="index==0">
- and TO_DAYS(t1.applayDate) = TO_DAYS(NOW())
+ and TO_DAYS(t2.applayDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t1.applayDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t2.applayDate,'%Y-%m-%d')) = YEARWEEK(now())
</when>
<when test="index==2">
- and date_format(t1.applayDate,'%Y-%m') = date_format(now(),'%Y-%m')
+ and date_format(t2.applayDate,'%Y-%m') = date_format(now(),'%Y-%m')
</when>
<otherwise>
- and YEAR(t1.applayDate)=YEAR(NOW())
+ and YEAR(t2.applayDate)=YEAR(NOW())
</otherwise>
</choose>
</select>
@@ -379,22 +384,22 @@
SELECT
count(1) ygtj
FROM
- 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
+ t_emp_baseinfo t right JOIN t_emp_physicalexam 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="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}
+ and date_format(t2.physicalExamDate,'%Y-%m-%d') >= #{btime} and date_format(t2.physicalExamDate,'%Y-%m-%d') <= #{etime}
</when>
<when test="index==0">
- and TO_DAYS(t1.physicalExamDate) = TO_DAYS(NOW())
+ and TO_DAYS(t2.physicalExamDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t1.physicalExamDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t2.physicalExamDate,'%Y-%m-%d')) = YEARWEEK(now())
</when>
<when test="index==2">
- and date_format(t1.physicalExamDate,'%Y-%m') = date_format(now(),'%Y-%m')
+ and date_format(t2.physicalExamDate,'%Y-%m') = date_format(now(),'%Y-%m')
</when>
<otherwise>
- and YEAR(t1.physicalExamDate)=YEAR(NOW())
+ and YEAR(t2.physicalExamDate)=YEAR(NOW())
</otherwise>
</choose>
</select>
@@ -402,7 +407,7 @@
SELECT
count(1) sfz
FROM
- t_emp_baseinfo t where 1=1 and t.delFlag=0 and t.empStatus=0
+ t_emp_baseinfo t inner join t_dept t1 on t.deptId=t1.DEPT_ID ${ew.customSqlSegment} 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}
@@ -426,19 +431,19 @@
SELECT
count(1) ygtg
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
+ 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(t1.changeDate) = TO_DAYS(NOW())
+ and TO_DAYS(t2.changeDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t1.changeDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t2.changeDate,'%Y-%m-%d')) = YEARWEEK(now())
</when>
<when test="index==2">
- and date_format(t1.changeDate,'%Y-%m') = date_format(now(),'%Y-%m')
+ and date_format(t2.changeDate,'%Y-%m') = date_format(now(),'%Y-%m')
</when>
<otherwise>
- and YEAR(t1.changeDate)=YEAR(NOW())
+ and YEAR(t2.changeDate)=YEAR(NOW())
</otherwise>
</choose>
</select>
@@ -447,30 +452,40 @@
SELECT
count(1) bljl
FROM
- 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
+ t_emp_baseinfo t right JOIN t_emp_badrecord 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="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}
+ and date_format(t2.badDate,'%Y-%m-%d') >= #{btime} and date_format(t2.badDate,'%Y-%m-%d') <= #{etime}
</when>
<when test="index==0">
- and TO_DAYS(t1.badDate) = TO_DAYS(NOW())
+ and TO_DAYS(t2.badDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t1.badDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t2.badDate,'%Y-%m-%d')) = YEARWEEK(now())
</when>
<when test="index==2">
- and date_format(t1.badDate,'%Y-%m') = date_format(now(),'%Y-%m')
+ and date_format(t2.badDate,'%Y-%m') = date_format(now(),'%Y-%m')
</when>
<otherwise>
- and YEAR(t1.badDate)=YEAR(NOW())
+ and YEAR(t2.badDate)=YEAR(NOW())
</otherwise>
</choose>
</select>
+ <select id="selectCountlz" resultType="java.lang.Integer">
+ SELECT
+ count(1)
+ FROM
+ t_emp_baseinfo t inner join t_dept t1 on t.deptId=t1.DEPT_ID ${ew.customSqlSegment}
+ </select>
<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 t1.empStatus=0 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.empStatus=0 and t1.delFlag=0
+ and t2.DEPT_ID in
+ <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+ #{item}
+ </foreach>
<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},'%'))
@@ -482,13 +497,19 @@
SELECT
t.*
FROM
- 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}
+ 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} and t2.DEPT_ID in
+ <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+ #{item}
+ </foreach>
UNION
SELECT
t.*
FROM
- 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}
+ 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} and t2.DEPT_ID in
+ <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+ #{item}
+ </foreach>
) 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
@@ -500,6 +521,10 @@
<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 and t1.empStatus=0
+ and t2.DEPT_ID in
+ <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+ #{item}
+ </foreach>
<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},'%'))
@@ -525,6 +550,10 @@
</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 and t1.delFlag=0
+ and t2.DEPT_ID in
+ <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+ #{item}
+ </foreach>
<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},'%'))
@@ -553,6 +582,10 @@
<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 t1.empType='01' and t1.delFlag=0 and t1.empStatus=0
+ and t2.DEPT_ID in
+ <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+ #{item}
+ </foreach>
<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},'%'))
@@ -560,7 +593,11 @@
</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 t1.empType='02' and t1.delFlag=0 and t1.empStatus=0
+ select t1.* from t_emp_baseinfo t1 left join t_dept t2 on t1.deptId=t2.DEPT_ID where t1.empType='02'
+ and t2.DEPT_ID in
+ <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+ #{item}
+ </foreach> 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},'%'))
@@ -570,7 +607,11 @@
<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 and t1.delFlag=0 and t1.empStatus=1
+ select t1.* from t_emp_baseinfo t1 left join t_dept t2 on t1.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 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},'%'))
@@ -583,7 +624,11 @@
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 and t.delFlag=0 and t1.delFlag=0
+ 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 t2.DEPT_ID in
+ <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+ #{item}
+ </foreach> 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},'%'))
@@ -611,6 +656,10 @@
<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 and t1.delFlag=0 and t1.empStatus='1'
+ and t2.DEPT_ID in
+ <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+ #{item}
+ </foreach>
<choose>
<when test="number==8">
and t1.dimissionType = '1'
@@ -651,7 +700,11 @@
<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 and t.delFlag=0 and t1.delFlag=0
+ select t1.*,t.allDeptName 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
+ and t2.DEPT_ID in
+ <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+ #{item}
+ </foreach>
<choose>
<when test="number==14">
and t1.contractStatus = '2'
@@ -726,9 +779,13 @@
<select id="dqbaseInfoList" resultType="cc.mrbird.febs.server.hr.entity.EmpBaseInfo">
SELECT
- t1.*
+ t1.*,t.allDeptName
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 t.delFlag=0 and t1.delFlag=0 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 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'
<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},'%'))
@@ -754,9 +811,13 @@
</select>
<select id="jcseInfoList" resultType="cc.mrbird.febs.server.hr.entity.EmpBaseInfo">
SELECT
- t1.*
+ t1.*,t.allDeptName
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 t.delFlag=0 and t1.delFlag=0 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 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 = '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},'%'))
@@ -782,9 +843,12 @@
</select>
<select id="empBaseInfoCqList" resultType="cc.mrbird.febs.server.hr.entity.EmpDimissionAttend">
SELECT
- t1.*
+ t1.*,t.allDeptName
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 and t.delFlag=0 and t1.delFlag=0
+ 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 t2.DEPT_ID in
+ <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+ #{item}
+ </foreach> and t.delFlag=0 and t1.delFlag=0
<choose>
<when test="number==3">
and t1.absenteeism !=0
@@ -818,9 +882,12 @@
<select id="empBaseInfoQjList" resultType="cc.mrbird.febs.server.hr.entity.EmpLeaveInfo">
SELECT
- t1.*
+ t1.*,t.allDeptName
FROM
- 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
+ t_emp_baseinfo t right JOIN t_emp_leaveinfo 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
<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},'%'))
@@ -847,9 +914,12 @@
<select id="empBaseInfoTjList" resultType="cc.mrbird.febs.server.hr.entity.EmpPhysicalExam">
SELECT
- t1.*
+ t1.*,t.allDeptName
FROM
- 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
+ t_emp_baseinfo t right JOIN t_emp_physicalexam 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
<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},'%'))
@@ -879,9 +949,12 @@
<select id="empBaseInfoLzList" resultType="cc.mrbird.febs.server.hr.entity.EmpLaborTrouble">
SELECT
- t1.*
+ t1.*,t.allDeptName
FROM
- 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
+ t_emp_baseinfo t right JOIN t_emp_labortrouble 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
<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},'%'))
@@ -910,9 +983,12 @@
<select id="empBaseInfoGsList" resultType="cc.mrbird.febs.server.hr.entity.EmpOccupational">
SELECT
- t1.*
+ t1.*,t.allDeptName
FROM
- 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
+ t_emp_baseinfo t right JOIN t_emp_occupational 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
<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},'%'))
@@ -939,9 +1015,12 @@
<select id="empBaseInfoYwList" resultType="cc.mrbird.febs.server.hr.entity.EmpAccidentCases">
SELECT
- t1.*
+ t1.*,t.allDeptName
FROM
- 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
+ t_emp_baseinfo t right JOIN t_emp_accidentcases 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
<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},'%'))
@@ -969,9 +1048,12 @@
<select id="empBaseInfoSbList" resultType="cc.mrbird.febs.server.hr.entity.EmpInsurance">
SELECT
- t1.*
+ t1.*,t.allDeptName
FROM
- 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
+ t_emp_baseinfo t right JOIN t_emp_insurance 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
<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},'%'))
@@ -999,9 +1081,12 @@
<select id="empBaseInfoSyjList" resultType="cc.mrbird.febs.server.hr.entity.EmpUnemployment">
SELECT
- t1.*
+ t1.*,t.allDeptName
FROM
- 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
+ t_emp_baseinfo t right JOIN t_emp_unemployment 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
<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},'%'))
@@ -1028,9 +1113,12 @@
<select id="empBaseInfoBlList" resultType="cc.mrbird.febs.server.hr.entity.EmpBadRecord">
SELECT
- t1.*
+ t1.*,t.allDeptName
FROM
- 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
+ t_emp_baseinfo t right JOIN t_emp_badrecord 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
<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},'%'))
@@ -1058,9 +1146,12 @@
<select id="empBaseInfoTgList" resultType="cc.mrbird.febs.server.hr.entity.EmpJobChange">
SELECT
- t1.*,t.empNumb,t.deptName,t.certificateNumb
+ 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 where 1=1 and t.delFlag=0 and t1.delFlag=0
+ 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
<if test="name!= 'undefined' and name!=null and 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},'%'))
--
Gitblit v1.8.0