From ecad6bdfc3a547d8aa4ae80aec4f060c10e442e0 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期五, 26 二月 2021 17:05:31 +0800
Subject: [PATCH] 修改bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java | 62 ++++++++++++++++++++++++++++++-
1 files changed, 60 insertions(+), 2 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java
index ce302be..687f61e 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java
@@ -2,8 +2,12 @@
import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpResign;
+import cc.mrbird.febs.server.hr.entity.EmpResign;
import cc.mrbird.febs.server.hr.mapper.EmpResignMapper;
import cc.mrbird.febs.server.hr.service.IEmpResignService;
+import cn.hutool.core.date.DateUtil;
+
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
@@ -13,8 +17,11 @@
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.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 java.util.*;
@@ -32,6 +39,7 @@
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class EmpResignServiceImpl extends ServiceImpl<EmpResignMapper, EmpResign> implements IEmpResignService {
+ private final RedisService redisService;
private final EmpResignMapper empResignMapper;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
@@ -40,15 +48,33 @@
@Override
public IPage<EmpResign> findEmpResigns(QueryRequest request, EmpResign empResign) {
LambdaQueryWrapper<EmpResign> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpResign::getDelFlag, 0);
+ queryWrapper.eq(EmpResign::getDelFlag, empResign.getDelFlag());
Page<EmpResign> page = new Page<>(request.getPageNum(), request.getPageSize());
+ if (StringUtils.isNotBlank(empResign.getEmpNumb())) {
+ queryWrapper.like(EmpResign::getEmpNumb, empResign.getEmpNumb());
+ }
+ if (StringUtils.isNotBlank(empResign.getEmpName())) {
+ queryWrapper.like(EmpResign::getEmpName, empResign.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empResign.getCertificateNumb())) {
+ queryWrapper.like(EmpResign::getCertificateNumb, empResign.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empResign.getDeptName())) {
+ queryWrapper.like(EmpResign::getDeptName, empResign.getDeptName());
+ }
+ if (StringUtils.isNotBlank(empResign.getApplayDateStr())) {
+ queryWrapper.between(EmpResign::getApplayDate, empResign.getApplayDateStr().split(",")[0], empResign.getApplayDateStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empResign.getReason())) {
+ queryWrapper.like(EmpResign::getReason, empResign.getReason());
+ }
return this.page(page, queryWrapper);
}
@Override
public List<EmpResign> findEmpResigns(EmpResign empResign) {
LambdaQueryWrapper<EmpResign> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpResign::getDelFlag, 0);
+ queryWrapper.eq(EmpResign::getDelFlag, empResign.getDelFlag());
return this.baseMapper.selectList(queryWrapper);
}
@@ -97,4 +123,36 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
empResignMapper.logicDeleteByIds(list, operatorId);
}
+
+ @Override
+ public boolean momentToNormal(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ return empResignMapper.momentToNormal(list, operatorId)>0;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void importEmpResign(List<List<Object>> listObject) {
+ for (List<Object> list : listObject) {
+ EmpResign resign = new EmpResign();
+ resign.setResignId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ resign.setEmpNumb(list.get(0).toString());
+ List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
+ Long deptId = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().get()
+ .getDeptId();
+ resign.setDeptName(list.get(1).toString());
+ resign.setDeptId(deptId);
+ resign.setJobName(list.get(2).toString());
+ resign.setEmpName(list.get(3).toString());
+ resign.setCertificateNumb(list.get(4).toString());
+ if (StringUtils.isNotBlank(list.get(5).toString())) {
+ resign.setApplayDate(DateUtil.parseDate(list.get(5).toString()));
+ }
+ resign.setReason(list.get(6).toString());
+ resign.setReporter(list.get(7).toString());
+ resign.setRemark(list.get(8).toString());
+ this.save(resign);
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0