From 4fe77f83783b35d9e541d6dd56d95b40f0af0670 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 18 三月 2021 07:19:41 +0800
Subject: [PATCH] fix(bug修复): 重新打开档案时，将原离职日期设置成1900-01-01，以便前端不再显示
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java | 76 ++++++++++++++++++++++++++-----------
1 files changed, 53 insertions(+), 23 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
index 59be955..bebc443 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
@@ -1,10 +1,13 @@
package cc.mrbird.febs.server.hr.service.impl;
import cc.mrbird.febs.common.core.constant.ModuleCode;
+import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
import cc.mrbird.febs.common.core.entity.system.Dept;
+import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.CastUtil;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;
+import cc.mrbird.febs.common.core.utils.SortUtil;
import cc.mrbird.febs.common.redis.service.RedisService;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.entity.EmpWorkExperience;
@@ -26,6 +29,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
import java.util.*;
@@ -46,9 +50,7 @@
private final EmpWorkExperienceMapper empWorkexperienceMapper;
private final IRemoteDeptService remoteDeptService;
private final IEmpBaseInfoService empBaseInfoService;
- private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
- .map(u -> u.getUserId().toString())
- .orElse("1");
+
private final RedisService redisService;
@Override
@@ -70,9 +72,15 @@
if (StringUtils.isNotBlank(empWorkexperience.getJobContent())) {
queryWrapper.like("a.jobContent", empWorkexperience.getJobContent());
}
- Page<EmpWorkExperience> page = new Page<>(request.getPageNum(), request.getPageSize());
+ if (StringUtils.isNotBlank(empWorkexperience.getEmpStatus())) {
+ queryWrapper.in("a.EmpStatus", empWorkexperience.getEmpStatus().split(","));
+ } else {
+ queryWrapper.in("a.EmpStatus", 0);
+ }
+ queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
- queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts());
+ Page<EmpWorkExperience> page = new Page<>(request.getPageNum(), request.getPageSize());
+ SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
return this.empWorkexperienceMapper.selectPageVo(page, queryWrapper);
}
@@ -80,23 +88,33 @@
public List<EmpWorkExperience> findEmpWorkExperiences(EmpWorkExperience empWorkexperience) {
LambdaQueryWrapper<EmpWorkExperience> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(EmpWorkExperience::getDelFlag,empWorkexperience.getDelFlag());
+ if(StringUtils.isNotBlank(empWorkexperience.getEmpNumb())){
+ queryWrapper.eq(EmpWorkExperience::getEmpNumb,empWorkexperience.getEmpNumb());
+ }
return this.baseMapper.selectList(queryWrapper);
}
@Override
@Transactional(rollbackFor = Exception.class)
- public void createEmpWorkExperience(EmpWorkExperience empWorkexperience) {
- empWorkexperience.setWorkExperienceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
- empWorkexperience.setDeptId(1L);
- empWorkexperience.setJobId(1L);
- empWorkexperience.setCreator(operatorId);
- empWorkexperience.setModifier(operatorId);
- this.save(empWorkexperience);
+ public void createEmpWorkExperience(EmpWorkExperience empWorkexperience) throws FebsException {
+ String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
+ .map(u -> u.getUserId().toString())
+ .orElse("1");
+ if(!checkRepetitiveData(empWorkexperience)) {
+ empWorkexperience.setWorkExperienceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ empWorkexperience.setCreator(operatorId);
+ empWorkexperience.setModifier(operatorId);
+ this.save(empWorkexperience);
+ } else {
+ throw new FebsException("已存在此工作经历");
+ }
}
@Override
@Transactional(rollbackFor = Exception.class)
public void updateEmpWorkExperience(EmpWorkExperience empWorkexperience) {
+ String operatorId = Optional.of(FebsUtil.getUserId())
+ .orElse("1");
EmpWorkExperience dbData = this.getById(empWorkexperience.getWorkExperienceId());
empWorkexperience.setCreateTime(dbData.getCreateTime());
empWorkexperience.setCreator(dbData.getCreator());
@@ -126,6 +144,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void logicDelEmpWorkExperience(String ids) {
+ String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
+ .map(u -> u.getUserId().toString())
+ .orElse("1");
List<String> list = new ArrayList<>();
String[] str = ids.split(",");
list.addAll(Arrays.asList(str));
@@ -134,6 +155,9 @@
@Override
public boolean momentToNormal(String ids) {
+ String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
+ .map(u -> u.getUserId().toString())
+ .orElse("1");
String[] str = ids.split(",");
List<String> list = new ArrayList<>(Arrays.asList(str));
return empWorkexperienceMapper.momentToNormal(list, operatorId)>0;
@@ -143,23 +167,20 @@
@Transactional(rollbackFor = Exception.class)
public void importEmpWorkExperience(List<List<Object>> listObject,List<String> returnList) {
for (List<Object> list : listObject) {
- if (list.size()==0){
+ if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
continue;
}
- Long empId = empBaseInfoService.getEmpIdByEmpNumb(list.get(0).toString());
+ EmpBaseInfo empId = empBaseInfoService.getEmpBaseInfoByEmpNumb(list.get(0).toString());
if (null == empId){
- returnList.add(StrUtil.format("导入失业金领取表异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
- continue;
- }
- List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
- Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().orElse(null);
- if (null == dept) {
- returnList.add(StrUtil.format("导入失业金领取表异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list)+1,list.get(1).toString()));
+ returnList.add(StrUtil.format("员工工作经历: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
continue;
}
EmpWorkExperience workExperience = new EmpWorkExperience();
- workExperience.setDeptName(list.get(1).toString());
- workExperience.setDeptId(dept.getDeptId());
+ workExperience.setEmpId(empId.getEmpId());
+ //工作经历中的部门
+ workExperience.setDeptName(list.get(4).toString());
+ //实际部门ID
+ workExperience.setDeptId(empId.getDeptId());
workExperience.setWorkExperienceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
workExperience.setEmpNumb(list.get(0).toString());
workExperience.setEmpName(list.get(1).toString());
@@ -179,4 +200,13 @@
this.save(workExperience);
}
}
+
+ private boolean checkRepetitiveData(EmpWorkExperience empWorkExperience){
+ LambdaQueryWrapper<EmpWorkExperience> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EmpWorkExperience::getDelFlag,empWorkExperience.getDelFlag());
+ queryWrapper.eq(EmpWorkExperience::getCertificateNumb, empWorkExperience.getCertificateNumb());
+ queryWrapper.eq(EmpWorkExperience::getBeginDate,empWorkExperience.getBeginDate());
+
+ return this.list(queryWrapper).size()>0;
+ }
}
--
Gitblit v1.8.0