From 9bc6b681dd59e1aa6358d136d6f63a2477b0a49a Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期日, 21 二月 2021 13:17:17 +0800
Subject: [PATCH] fix(在职员工): 关闭档案
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml | 77 +++++++++++++++++++++++++++++++++++++-
1 files changed, 75 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 e9dce2e..0f76dd6 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
@@ -2,6 +2,9 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<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>
<select id="countBaseInfoList" resultType="java.util.Map">
SELECT
@@ -16,7 +19,8 @@
) zdlz,
count(
IF (t.dimissionType = '4', 1, NULL)
- ) gsct
+ ) 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
FROM
t_emp_baseinfo t where 1=1
<choose>
@@ -24,7 +28,7 @@
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())
@@ -454,6 +458,46 @@
</choose>
</select>
+
+ <select id="clbaseInfoList" resultType="cc.mrbird.febs.server.hr.entity.EmpBaseInfo">
+ select t1.* from (
+ 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}
+ 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}
+ ) 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
<if test="name!= 'undefined' and name!=null and name!=''">
@@ -1029,4 +1073,33 @@
</choose>
</select>
+
+
+ <select id="empBaseInfoTgList" resultType="cc.mrbird.febs.server.hr.entity.EmpJobChange">
+ SELECT
+ t1.*
+ FROM
+ t_emp_baseinfo t right JOIN t_emp_jobChange t1 on t.empId=t1.empId where 1=1
+ <if test="name!= 'undefined' and name!=null and name!=''">
+ and t1.empName 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.changeDate,'%Y-%m-%d') >= #{btime} and date_format(t1.changeDate,'%Y-%m-%d') <= #{etime}
+ </when>
+ <when test="index==0">
+ and TO_DAYS(t1.changeDate) = TO_DAYS(NOW())
+ </when>
+ <when test="index==1">
+ and YEARWEEK(date_format(t1.changeDate,'%Y-%m-%d')) = YEARWEEK(now())
+ </when>
+ <when test="index==2">
+ and date_format(t1.changeDate,'%Y-%m') = date_format(now(),'%Y-%m')
+ </when>
+ <otherwise>
+ and YEAR(t1.changeDate)=YEAR(NOW())
+ </otherwise>
+ </choose>
+
+ </select>
</mapper>
--
Gitblit v1.8.0