From b97dc921008fc61a7e0d9de04dbce2956e65e178 Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期二, 10 三月 2026 12:46:53 +0800
Subject: [PATCH] feat(hr): 添加员工转正和退休管理功能
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml | 82 ++++++++++++++++++++--------------------
1 files changed, 41 insertions(+), 41 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 ec5ce3e..b4d6284 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
@@ -7,12 +7,12 @@
</select>
<select id="selectPageVo" resultType="cc.mrbird.febs.server.hr.entity.EmpBaseInfo">
- select a.* from t_emp_baseInfo a
+ select a.* from t_emp_baseinfo a
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
+ select a.* from t_emp_baseinfo a
inner join t_dept c on a.deptId = c.DEPT_ID
${ew.customSqlSegment}
</select>
@@ -37,7 +37,7 @@
and TO_DAYS(t2.dimissionDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t2.dimissionDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t2.dimissionDate,'%Y-%m-%d'),1) = YEARWEEK(now())
</when>
<when test="index==2">
and date_format(t2.dimissionDate,'%Y-%m') = date_format(now(),'%Y-%m')
@@ -73,7 +73,7 @@
and TO_DAYS(t.entryDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t.entryDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t.entryDate,'%Y-%m-%d'),1) = YEARWEEK(now())
</when>
<when test="index==2">
and date_format(t.entryDate,'%Y-%m') = date_format(now(),'%Y-%m')
@@ -97,7 +97,7 @@
and TO_DAYS(t.dimissionDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t.dimissionDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t.dimissionDate,'%Y-%m-%d'),1) = YEARWEEK(now())
</when>
<when test="index==2">
and date_format(t.dimissionDate,'%Y-%m') = date_format(now(),'%Y-%m')
@@ -120,7 +120,7 @@
and TO_DAYS(t2.applayDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t2.applayDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t2.applayDate,'%Y-%m-%d'),1) = YEARWEEK(now())
</when>
<when test="index==2">
and date_format(t2.applayDate,'%Y-%m') = date_format(now(),'%Y-%m')
@@ -146,7 +146,7 @@
and TO_DAYS(t2.signingDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t2.signingDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t2.signingDate,'%Y-%m-%d'),1) = YEARWEEK(now())
</when>
<when test="index==2">
and date_format(t2.signingDate,'%Y-%m') = date_format(now(),'%Y-%m')
@@ -171,7 +171,7 @@
and TO_DAYS(t2.signingDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t2.signingDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t2.signingDate,'%Y-%m-%d'),1) = YEARWEEK(now())
</when>
<when test="index==2">
and date_format(t2.signingDate,'%Y-%m') = date_format(now(),'%Y-%m')
@@ -185,7 +185,7 @@
<select id="countDqhtBaseInfoList" resultType="java.lang.Integer">
SELECT
- count(IF(t2.contractStatus = 4, 1, NULL)) dqht
+ count(IF(t2.contractStatus in('1','2'), 1, NULL)) dqht
FROM
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>
@@ -196,7 +196,7 @@
and TO_DAYS(t2.endDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t2.endDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t2.endDate,'%Y-%m-%d'),1) = YEARWEEK(now())
</when>
<when test="index==2">
and date_format(t2.endDate,'%Y-%m') = date_format(now(),'%Y-%m')
@@ -242,7 +242,7 @@
and TO_DAYS(t2.returnDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t2.returnDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t2.returnDate,'%Y-%m-%d'),1) = YEARWEEK(now())
</when>
<when test="index==2">
and date_format(t2.returnDate,'%Y-%m') = date_format(now(),'%Y-%m')
@@ -275,7 +275,7 @@
and TO_DAYS(t2.arbitrationDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t2.arbitrationDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t2.arbitrationDate,'%Y-%m-%d'),1) = YEARWEEK(now())
</when>
<when test="index==2">
and date_format(t2.arbitrationDate,'%Y-%m') = date_format(now(),'%Y-%m')
@@ -299,7 +299,7 @@
and TO_DAYS(t2.injuredTime) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t2.injuredTime,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t2.injuredTime,'%Y-%m-%d'),1) = YEARWEEK(now())
</when>
<when test="index==2">
and date_format(t2.injuredTime,'%Y-%m') = date_format(now(),'%Y-%m')
@@ -320,7 +320,7 @@
and TO_DAYS(t2.injuredTime) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t2.injuredTime,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t2.injuredTime,'%Y-%m-%d'),1) = YEARWEEK(now())
</when>
<when test="index==2">
and date_format(t2.injuredTime,'%Y-%m') = date_format(now(),'%Y-%m')
@@ -347,7 +347,7 @@
and TO_DAYS(t2.applayDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t2.applayDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t2.applayDate,'%Y-%m-%d'),1) = YEARWEEK(now())
</when>
<when test="index==2">
and date_format(t2.applayDate,'%Y-%m') = date_format(now(),'%Y-%m')
@@ -370,7 +370,7 @@
and TO_DAYS(t2.applayDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t2.applayDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t2.applayDate,'%Y-%m-%d'),1) = YEARWEEK(now())
</when>
<when test="index==2">
and date_format(t2.applayDate,'%Y-%m') = date_format(now(),'%Y-%m')
@@ -393,7 +393,7 @@
and TO_DAYS(t2.physicalExamDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t2.physicalExamDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t2.physicalExamDate,'%Y-%m-%d'),1) = YEARWEEK(now())
</when>
<when test="index==2">
and date_format(t2.physicalExamDate,'%Y-%m') = date_format(now(),'%Y-%m')
@@ -416,7 +416,7 @@
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'),1) <= YEARWEEK(now())
</when>
<when test="index==2">
and date_format(t.certificateValidity,'%Y-%m') <= date_format(now(),'%Y-%m')
@@ -431,13 +431,13 @@
SELECT
count(1) ygtg
FROM
- 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
+ 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(t2.changeDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t2.changeDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t2.changeDate,'%Y-%m-%d'),1) = YEARWEEK(now())
</when>
<when test="index==2">
and date_format(t2.changeDate,'%Y-%m') = date_format(now(),'%Y-%m')
@@ -461,7 +461,7 @@
and TO_DAYS(t2.badDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t2.badDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t2.badDate,'%Y-%m-%d'),1) = YEARWEEK(now())
</when>
<when test="index==2">
and date_format(t2.badDate,'%Y-%m') = date_format(now(),'%Y-%m')
@@ -537,7 +537,7 @@
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'),1) <= YEARWEEK(now())
</when>
<when test="index==2">
and date_format(t1.certificateValidity,'%Y-%m') <= date_format(now(),'%Y-%m')
@@ -566,7 +566,7 @@
and TO_DAYS(t1.entryDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t1.entryDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t1.entryDate,'%Y-%m-%d'),1) = YEARWEEK(now())
</when>
<when test="index==2">
and date_format(t1.entryDate,'%Y-%m') = date_format(now(),'%Y-%m')
@@ -641,7 +641,7 @@
and TO_DAYS(t1.applayDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t1.applayDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t1.applayDate,'%Y-%m-%d'),1) = YEARWEEK(now())
</when>
<when test="index==2">
and date_format(t1.applayDate,'%Y-%m') = date_format(now(),'%Y-%m')
@@ -686,7 +686,7 @@
and TO_DAYS(t.dimissionDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t.dimissionDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t.dimissionDate,'%Y-%m-%d'),1) = YEARWEEK(now())
</when>
<when test="index==2">
and date_format(t.dimissionDate,'%Y-%m') = date_format(now(),'%Y-%m')
@@ -716,7 +716,7 @@
and TO_DAYS(t1.signingDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t1.signingDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t1.signingDate,'%Y-%m-%d'),1) = YEARWEEK(now())
</when>
<when test="index==2">
and date_format(t1.signingDate,'%Y-%m') = date_format(now(),'%Y-%m')
@@ -736,7 +736,7 @@
and TO_DAYS(t1.signingDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t1.signingDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t1.signingDate,'%Y-%m-%d'),1) = YEARWEEK(now())
</when>
<when test="index==2">
and date_format(t1.signingDate,'%Y-%m') = date_format(now(),'%Y-%m')
@@ -756,7 +756,7 @@
and TO_DAYS(t1.signingDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t1.signingDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t1.signingDate,'%Y-%m-%d'),1) = YEARWEEK(now())
</when>
<when test="index==2">
and date_format(t1.signingDate,'%Y-%m') = date_format(now(),'%Y-%m')
@@ -785,7 +785,7 @@
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'
+ </foreach> and t.delFlag=0 and t1.delFlag=0 and t1.contractStatus in( '1','2') and t1.empStatus=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},'%'))
@@ -798,7 +798,7 @@
and TO_DAYS(t1.endDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t1.endDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t1.endDate,'%Y-%m-%d'),1) = YEARWEEK(now())
</when>
<when test="index==2">
and date_format(t1.endDate,'%Y-%m') = date_format(now(),'%Y-%m')
@@ -830,7 +830,7 @@
and TO_DAYS(t.dimissionDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t.dimissionDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t.dimissionDate,'%Y-%m-%d'),1) = YEARWEEK(now())
</when>
<when test="index==2">
and date_format(t.dimissionDate,'%Y-%m') = date_format(now(),'%Y-%m')
@@ -900,7 +900,7 @@
and TO_DAYS(t1.returnDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t1.returnDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t1.returnDate,'%Y-%m-%d'),1) = YEARWEEK(now())
</when>
<when test="index==2">
and date_format(t1.returnDate,'%Y-%m') = date_format(now(),'%Y-%m')
@@ -932,7 +932,7 @@
and TO_DAYS(t1.physicalExamDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t1.physicalExamDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t1.physicalExamDate,'%Y-%m-%d'),1) = YEARWEEK(now())
</when>
<when test="index==2">
and date_format(t1.physicalExamDate,'%Y-%m') = date_format(now(),'%Y-%m')
@@ -967,7 +967,7 @@
and TO_DAYS(t1.arbitrationDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t1.arbitrationDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t1.arbitrationDate,'%Y-%m-%d'),1) = YEARWEEK(now())
</when>
<when test="index==2">
and date_format(t1.arbitrationDate,'%Y-%m') = date_format(now(),'%Y-%m')
@@ -1001,7 +1001,7 @@
and TO_DAYS(t1.injuredTime) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t1.injuredTime,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t1.injuredTime,'%Y-%m-%d'),1) = YEARWEEK(now())
</when>
<when test="index==2">
and date_format(t1.injuredTime,'%Y-%m') = date_format(now(),'%Y-%m')
@@ -1033,7 +1033,7 @@
and TO_DAYS(t1.injuredTime) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t1.injuredTime,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t1.injuredTime,'%Y-%m-%d'),1) = YEARWEEK(now())
</when>
<when test="index==2">
and date_format(t1.injuredTime,'%Y-%m') = date_format(now(),'%Y-%m')
@@ -1066,7 +1066,7 @@
and TO_DAYS(t1.applayDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t1.applayDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t1.applayDate,'%Y-%m-%d'),1) = YEARWEEK(now())
</when>
<when test="index==2">
and date_format(t1.applayDate,'%Y-%m') = date_format(now(),'%Y-%m')
@@ -1099,7 +1099,7 @@
and TO_DAYS(t1.applayDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t1.applayDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t1.applayDate,'%Y-%m-%d'),1) = YEARWEEK(now())
</when>
<when test="index==2">
and date_format(t1.applayDate,'%Y-%m') = date_format(now(),'%Y-%m')
@@ -1131,7 +1131,7 @@
and TO_DAYS(t1.badDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t1.badDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t1.badDate,'%Y-%m-%d'),1) = YEARWEEK(now())
</when>
<when test="index==2">
and date_format(t1.badDate,'%Y-%m') = date_format(now(),'%Y-%m')
@@ -1148,7 +1148,7 @@
SELECT
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 inner join t_dept t2 on t.deptId=t2.DEPT_ID where 1=1 and t2.DEPT_ID in
+ 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
@@ -1164,7 +1164,7 @@
and TO_DAYS(t1.changeDate) = TO_DAYS(NOW())
</when>
<when test="index==1">
- and YEARWEEK(date_format(t1.changeDate,'%Y-%m-%d')) = YEARWEEK(now())
+ and YEARWEEK(date_format(t1.changeDate,'%Y-%m-%d'),1) = YEARWEEK(now())
</when>
<when test="index==2">
and date_format(t1.changeDate,'%Y-%m') = date_format(now(),'%Y-%m')
--
Gitblit v1.8.0