From a704eb0aced975b55f39d71591ef87f2539e1263 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 12 三月 2021 09:21:57 +0800
Subject: [PATCH] fix(bug修复): 员工智搜导出字段调整
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java | 123 +++++++++++++++++++++++++++++++++++------
1 files changed, 105 insertions(+), 18 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 e8fa729..696457b 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,23 +1,35 @@
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;
+import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpWorkExperienceMapper;
+import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cc.mrbird.febs.server.hr.service.IEmpWorkExperienceService;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
import lombok.RequiredArgsConstructor;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.*;
@@ -36,51 +48,73 @@
class EmpWorkExperienceServiceImpl extends ServiceImpl<EmpWorkExperienceMapper, EmpWorkExperience> implements IEmpWorkExperienceService {
private final EmpWorkExperienceMapper empWorkexperienceMapper;
- private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
- .map(u -> u.getUserId().toString())
- .orElse("1");
+ private final IRemoteDeptService remoteDeptService;
+ private final IEmpBaseInfoService empBaseInfoService;
+
+ private final RedisService redisService;
@Override
public IPage<EmpWorkExperience> findEmpWorkExperiences(QueryRequest request, EmpWorkExperience empWorkexperience) {
- LambdaQueryWrapper<EmpWorkExperience> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpWorkExperience::getDelFlag,empWorkexperience.getDelFlag());
+ QueryWrapper<EmpWorkExperience> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("a.delFlag",empWorkexperience.getDelFlag());
if (StringUtils.isNotBlank(empWorkexperience.getEmpNumb())) {
- queryWrapper.eq(EmpWorkExperience::getEmpNumb, empWorkexperience.getEmpNumb());
+ queryWrapper.like("a.empNumb", empWorkexperience.getEmpNumb());
}
if (StringUtils.isNotBlank(empWorkexperience.getEmpName())) {
- queryWrapper.eq(EmpWorkExperience::getEmpName, empWorkexperience.getEmpName());
+ queryWrapper.like("a.EmpName", empWorkexperience.getEmpName());
}
if (StringUtils.isNotBlank(empWorkexperience.getCertificateNumb())) {
- queryWrapper.eq(EmpWorkExperience::getCertificateNumb, empWorkexperience.getCertificateNumb());
+ queryWrapper.like("a.certificateNumb", empWorkexperience.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empWorkexperience.getCertificateNumb())) {
+ queryWrapper.like("a.certificateNumb", empWorkexperience.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empWorkexperience.getJobContent())) {
+ queryWrapper.like("a.jobContent", empWorkexperience.getJobContent());
}
if (StringUtils.isNotBlank(empWorkexperience.getEmpStatus())) {
- queryWrapper.eq(EmpWorkExperience::getEmpStatus, 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));
+
Page<EmpWorkExperience> page = new Page<>(request.getPageNum(), request.getPageSize());
- return this.page(page, queryWrapper);
+ SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
+ return this.empWorkexperienceMapper.selectPageVo(page, queryWrapper);
}
@Override
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());
@@ -110,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));
@@ -118,8 +155,58 @@
@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;
}
-}
\ No newline at end of file
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void importEmpWorkExperience(List<List<Object>> listObject,List<String> returnList) {
+ for (List<Object> list : listObject) {
+ if (list.size()==0){
+ continue;
+ }
+ EmpBaseInfo empId = empBaseInfoService.getEmpBaseInfoByEmpNumb(list.get(0).toString());
+ if (null == empId){
+ returnList.add(StrUtil.format("员工工作经历: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
+ continue;
+ }
+ EmpWorkExperience workExperience = new EmpWorkExperience();
+ 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());
+ workExperience.setCertificateNumb(list.get(2).toString());
+ workExperience.setSex("男".equals(list.get(3).toString()) ? "1" : "2");
+ workExperience.setWorkUnit(list.get(4).toString());
+ if (StringUtils.isNotBlank(list.get(5).toString())) {
+ workExperience.setBeginDate(DateUtil.parseDate(list.get(5).toString()));
+ }
+ if (StringUtils.isNotBlank(list.get(6).toString())) {
+ workExperience.setEndDate(DateUtil.parseDate(list.get(6).toString()));
+ }
+ workExperience.setJobContent(list.get(7).toString());
+ workExperience.setCreator(FebsUtil.getUserId());
+ workExperience.setModifier(FebsUtil.getUserId());
+ workExperience.setDelFlag(2);
+ 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