From 551fe577e2e6b8cfc84b17fbc38b95f41c07ad00 Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期六, 06 三月 2021 17:26:26 +0800
Subject: [PATCH] 员工查询条件关系修改
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 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..fc2e31e 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
@@ -26,6 +26,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 +47,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
@@ -86,9 +85,10 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void createEmpWorkExperience(EmpWorkExperience empWorkexperience) {
+ String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
+ .map(u -> u.getUserId().toString())
+ .orElse("1");
empWorkexperience.setWorkExperienceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
- empWorkexperience.setDeptId(1L);
- empWorkexperience.setJobId(1L);
empWorkexperience.setCreator(operatorId);
empWorkexperience.setModifier(operatorId);
this.save(empWorkexperience);
@@ -97,6 +97,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void updateEmpWorkExperience(EmpWorkExperience empWorkexperience) {
+ String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
+ .map(u -> u.getUserId().toString())
+ .orElse("1");
EmpWorkExperience dbData = this.getById(empWorkexperience.getWorkExperienceId());
empWorkexperience.setCreateTime(dbData.getCreateTime());
empWorkexperience.setCreator(dbData.getCreator());
@@ -126,6 +129,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 +140,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;
@@ -148,17 +157,17 @@
}
Long empId = empBaseInfoService.getEmpIdByEmpNumb(list.get(0).toString());
if (null == empId){
- returnList.add(StrUtil.format("导入失业金领取表异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
+ 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);
+ Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(4).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(4).toString()));
continue;
}
EmpWorkExperience workExperience = new EmpWorkExperience();
- workExperience.setDeptName(list.get(1).toString());
+ workExperience.setDeptName(list.get(4).toString());
workExperience.setDeptId(dept.getDeptId());
workExperience.setWorkExperienceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
workExperience.setEmpNumb(list.get(0).toString());
--
Gitblit v1.8.0