From 1d73bcf0d8f48031d258c55d5843c42eee6271a0 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期日, 14 三月 2021 14:27:25 +0800
Subject: [PATCH] xx
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml | 42 ++++++++++++++++++++++++------------------
1 files changed, 24 insertions(+), 18 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 6562ef3..3e8ea5a 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
@@ -41,8 +47,8 @@
<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.empType = '01', 1, NULL)) zsyg,
+ 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
@@ -546,7 +552,7 @@
<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='1' 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='01' 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},'%'))
@@ -554,7 +560,7 @@
</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='2' 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 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},'%'))
@@ -645,7 +651,7 @@
<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
<choose>
<when test="number==14">
and t1.contractStatus = '2'
@@ -720,7 +726,7 @@
<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'
<if test="name!= 'undefined' and name!=null and name!=''">
@@ -748,7 +754,7 @@
</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'
<if test="name!= 'undefined' and name!=null and name!=''">
@@ -776,7 +782,7 @@
</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
<choose>
@@ -812,7 +818,7 @@
<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
<if test="name!= 'undefined' and name!=null and name!=''">
@@ -841,7 +847,7 @@
<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
<if test="name!= 'undefined' and name!=null and name!=''">
@@ -873,7 +879,7 @@
<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
<if test="name!= 'undefined' and name!=null and name!=''">
@@ -904,7 +910,7 @@
<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
<if test="name!= 'undefined' and name!=null and name!=''">
@@ -933,7 +939,7 @@
<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
<if test="name!= 'undefined' and name!=null and name!=''">
@@ -963,7 +969,7 @@
<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
<if test="name!= 'undefined' and name!=null and name!=''">
@@ -993,7 +999,7 @@
<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
<if test="name!= 'undefined' and name!=null and name!=''">
@@ -1022,7 +1028,7 @@
<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
<if test="name!= 'undefined' and name!=null and name!=''">
@@ -1052,11 +1058,11 @@
<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
<if test="name!= 'undefined' and name!=null and name!=''">
- and (t.empNumb like CONCAT('%',#{name},'%') or t.empName like CONCAT('%',#{name},'%') or
+ 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>
--
Gitblit v1.8.0