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/service/impl/EmpDimissionLogServiceImpl.java | 3 +++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/ExportPdfServiceImpl.java | 2 +-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml | 26 +++++++++++++-------------
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 6 ++++++
4 files changed, 23 insertions(+), 14 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..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
@@ -651,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'
@@ -726,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!=''">
@@ -754,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!=''">
@@ -782,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>
@@ -818,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!=''">
@@ -847,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!=''">
@@ -879,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!=''">
@@ -910,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!=''">
@@ -939,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!=''">
@@ -969,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!=''">
@@ -999,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!=''">
@@ -1028,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!=''">
@@ -1058,7 +1058,7 @@
<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!=''">
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
index 74c080d..cd8b024 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
@@ -203,6 +203,12 @@
empBaseInfo.setDelFlag(dbData.getDelFlag());
empBaseInfo.setModifyTime(new Date());
empBaseInfo.setModifier(operatorId);
+ if(StringUtils.isBlank(empBaseInfo.getImagePath())){
+ empBaseInfo.setImagePath(dbData.getImagePath());
+ }
+ if(StringUtils.isBlank(empBaseInfo.getAllDeptName())){
+ empBaseInfo.setAllDeptName(dbData.getAllDeptName());
+ }
this.saveOrUpdate(empBaseInfo);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java
index fd5d3e4..508fc40 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java
@@ -60,6 +60,9 @@
if (StringUtils.isNotBlank(empDimissionlog.getDimissionType())) {
queryWrapper.eq("a.dimissionType", empDimissionlog.getDimissionType());
}
+ if (empDimissionlog.getEmpId()!=null) {
+ queryWrapper.eq("a.empId", empDimissionlog.getEmpId());
+ }
if (StringUtils.isNotBlank(empDimissionlog.getEmpStatus())) {
queryWrapper.in("b.EmpStatus", empDimissionlog.getEmpStatus().split(","));
} else {
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/ExportPdfServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/ExportPdfServiceImpl.java
index 8e11304..cfeff55 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/ExportPdfServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/ExportPdfServiceImpl.java
@@ -284,7 +284,7 @@
//入离职记录
String[] dimissionLog = { "入职日期", "离职日期", "离职类型", "自离天数", "报备人", "备注"};
EmpDimissionLog empDimissionLog=new EmpDimissionLog();
- empDimissionLog.setCertificateNumb(empNum);
+ empDimissionLog.setEmpId(empBaseInfo.getEmpId());
empDimissionLog.setEmpStatus(empBaseInfo.getEmpStatus());
List<Map<String, Object>> records1 = iEmpDimissionLogService.findEmpDimissionLogs(queryRequest, empDimissionLog).getRecords();
for (Map<String, Object> objectMap:records1){
--
Gitblit v1.8.0