From b97dc921008fc61a7e0d9de04dbce2956e65e178 Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期二, 10 三月 2026 12:46:53 +0800
Subject: [PATCH] feat(hr): 添加员工转正和退休管理功能
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java | 128 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 115 insertions(+), 13 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 2de822a..7fac10b 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
@@ -1,20 +1,34 @@
package cc.mrbird.febs.server.hr.service.impl;
import cc.mrbird.febs.common.core.constant.ModuleCode;
+import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
+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.constant.MyConstant;
import cc.mrbird.febs.server.hr.entity.EmpResign;
+import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpResignMapper;
+import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cc.mrbird.febs.server.hr.service.IEmpResignService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.annotation.Propagation;
-import lombok.RequiredArgsConstructor;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
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.utils.FebsUtil;
-import cc.mrbird.febs.common.core.utils.SequenceUtil;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
import java.util.*;
@@ -32,17 +46,43 @@
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class EmpResignServiceImpl extends ServiceImpl<EmpResignMapper, EmpResign> implements IEmpResignService {
+ private final RedisService redisService;
private final EmpResignMapper empResignMapper;
+ private final IEmpBaseInfoService empBaseInfoService;
+ private final IRemoteDeptService remoteDeptService;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
.orElse("1");
@Override
public IPage<EmpResign> findEmpResigns(QueryRequest request, EmpResign empResign) {
- LambdaQueryWrapper<EmpResign> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpResign::getDelFlag, empResign.getDelFlag());
+ QueryWrapper<EmpResign> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("a.DelFlag", empResign.getDelFlag());
Page<EmpResign> page = new Page<>(request.getPageNum(), request.getPageSize());
- return this.page(page, queryWrapper);
+ if (StringUtils.isNotBlank(empResign.getEmpNumb())) {
+ queryWrapper.like("a.EmpNumb", empResign.getEmpNumb());
+ }
+ if (StringUtils.isNotBlank(empResign.getEmpName())) {
+ queryWrapper.like("a.EmpName", empResign.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empResign.getCertificateNumb())) {
+ queryWrapper.like("a.CertificateNumb", empResign.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empResign.getDeptName())) {
+ queryWrapper.like("b.allDeptName", empResign.getDeptName());
+ }
+ if (StringUtils.isNotBlank(empResign.getApplayDateStr())) {
+ queryWrapper.between("a.ApplayDate", empResign.getApplayDateStr().split(",")[0], empResign.getApplayDateStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empResign.getReason())) {
+ queryWrapper.like("a.Reason", empResign.getReason());
+ }
+ if (StringUtils.isNotBlank(empResign.getEmpStatus())) {
+ queryWrapper.in("b.EmpStatus", empResign.getEmpStatus().split(","));
+ }
+ queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
+ SortUtil.handlePageSort(request, page, "applayDate", FebsConstant.ORDER_ASC, true);
+ return empResignMapper.selectPageVo(page, queryWrapper);
}
@Override
@@ -54,7 +94,14 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void createEmpResign(EmpResign empResign) {
+ public void createEmpResign(EmpResign empResign) throws FebsException {
+ LambdaQueryWrapper<EmpResign> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(EmpResign::getEmpId, empResign.getEmpId());
+ lambdaQueryWrapper.eq(EmpResign::getApplayDate, empResign.getApplayDate());
+ lambdaQueryWrapper.ne(EmpResign::getDelFlag,1);
+ if (this.count(lambdaQueryWrapper) > 0) {
+ throw new FebsException(MyConstant.MESSAGE);
+ }
empResign.setResignId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
empResign.setCreator(operatorId);
empResign.setModifier(operatorId);
@@ -63,7 +110,15 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void updateEmpResign(EmpResign empResign) {
+ public void updateEmpResign(EmpResign empResign) throws FebsException {
+ LambdaQueryWrapper<EmpResign> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(EmpResign::getEmpId, empResign.getEmpId());
+ lambdaQueryWrapper.eq(EmpResign::getApplayDate, empResign.getApplayDate());
+ lambdaQueryWrapper.ne(EmpResign::getDelFlag,1);
+ lambdaQueryWrapper.ne(EmpResign::getApplayDate,empResign.getApplayDate());
+ if (this.count(lambdaQueryWrapper) > 0) {
+ throw new FebsException(MyConstant.MESSAGE);
+ }
EmpResign dbData = this.getById(empResign.getResignId());
empResign.setCreateTime(dbData.getCreateTime());
empResign.setCreator(dbData.getCreator());
@@ -104,4 +159,51 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
return empResignMapper.momentToNormal(list, operatorId)>0;
}
-}
\ No newline at end of file
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void importEmpResign(List<List<Object>> listObject,List<String> returnList) {
+ for (List<Object> list : listObject) {
+ if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
+ continue;
+ }
+ 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);
+ if(null == depts){
+ depts =remoteDeptService.setDeptRedis();
+ }
+ 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;
+ }
+ Long empId = empBaseInfoService.getEmpIdByEmpNumb(list.get(0).toString());
+ if (null == empId){
+ returnList.add(StrUtil.format("导入员工辞职申请异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
+ continue;
+ }
+ resign.setDelFlag(0);
+ resign.setEmpId(empId);
+ resign.setDeptName(list.get(1).toString());
+ resign.setDeptId(dept.getDeptId());
+ resign.setJobName(list.get(2).toString());
+ resign.setEmpName(list.get(3).toString());
+ resign.setCertificateNumb(list.get(4).toString());
+ try {
+ if (StringUtils.isNotBlank(list.get(5).toString())) {
+ resign.setApplayDate(DateUtil.parse(list.get(5).toString()));
+ }
+ }catch (Exception e){
+ returnList.add(StrUtil.format("导入员工辞职申请异常: 出现位置第{}行, 原因:{}时间格式错误",listObject.indexOf(list)+1,list.get(0).toString()));
+ continue;
+ }
+
+ resign.setReason(list.get(6).toString());
+ resign.setReporter(list.get(7).toString());
+ resign.setRemark(list.get(8).toString());
+ this.save(resign);
+ }
+ }
+}
--
Gitblit v1.8.0