From 3ca0d2b2941d55398099af8679c66f2866a55cc1 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期四, 04 三月 2021 02:16:18 +0800
Subject: [PATCH] 修改bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java | 45 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 37 insertions(+), 8 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 0e2371b..3fcc6b2 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,24 +1,32 @@
package cc.mrbird.febs.server.hr.service.impl;
import cc.mrbird.febs.common.core.constant.ModuleCode;
+import cc.mrbird.febs.common.core.entity.system.Dept;
+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.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.*;
@@ -37,31 +45,36 @@
class EmpWorkExperienceServiceImpl extends ServiceImpl<EmpWorkExperienceMapper, EmpWorkExperience> implements IEmpWorkExperienceService {
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
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.like(EmpWorkExperience::getEmpNumb, empWorkexperience.getEmpNumb());
+ queryWrapper.like("a.empNumb", empWorkexperience.getEmpNumb());
}
if (StringUtils.isNotBlank(empWorkexperience.getEmpName())) {
- queryWrapper.like(EmpWorkExperience::getEmpName, empWorkexperience.getEmpName());
+ queryWrapper.like("a.EmpName", empWorkexperience.getEmpName());
}
if (StringUtils.isNotBlank(empWorkexperience.getCertificateNumb())) {
- queryWrapper.like(EmpWorkExperience::getCertificateNumb, empWorkexperience.getCertificateNumb());
+ queryWrapper.like("a.certificateNumb", empWorkexperience.getCertificateNumb());
}
if (StringUtils.isNotBlank(empWorkexperience.getCertificateNumb())) {
- queryWrapper.like(EmpWorkExperience::getCertificateNumb, empWorkexperience.getCertificateNumb());
+ queryWrapper.like("a.certificateNumb", empWorkexperience.getCertificateNumb());
}
if (StringUtils.isNotBlank(empWorkexperience.getJobContent())) {
- queryWrapper.like(EmpWorkExperience::getJobContent, empWorkexperience.getJobContent());
+ queryWrapper.like("a.jobContent", empWorkexperience.getJobContent());
}
Page<EmpWorkExperience> page = new Page<>(request.getPageNum(), request.getPageSize());
- return this.page(page, queryWrapper);
+
+ queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts());
+ return this.empWorkexperienceMapper.selectPageVo(page, queryWrapper);
}
@Override
@@ -134,7 +147,20 @@
if (list.size()==0){
continue;
}
+ Long empId = empBaseInfoService.getEmpIdByEmpNumb(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()));
+ continue;
+ }
EmpWorkExperience workExperience = new EmpWorkExperience();
+ workExperience.setDeptName(list.get(1).toString());
+ workExperience.setDeptId(dept.getDeptId());
workExperience.setWorkExperienceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
workExperience.setEmpNumb(list.get(0).toString());
workExperience.setEmpName(list.get(1).toString());
@@ -148,6 +174,9 @@
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);
}
}
--
Gitblit v1.8.0