From 6328f096bc75d835ecf6c25f58f1a452b8800a86 Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期四, 04 三月 2021 02:00:48 +0800
Subject: [PATCH] 数据权限加到考勤情况位置
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java | 63 ++++++++++++++++++++++++++++++-
1 files changed, 60 insertions(+), 3 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java
index 6cf699e..f66dacd 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java
@@ -6,6 +6,10 @@
import java.util.List;
import java.util.Optional;
+import cc.mrbird.febs.common.core.exception.FebsException;
+import cc.mrbird.febs.server.hr.constant.MyConstant;
+import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
+import cn.hutool.core.util.StrUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -18,11 +22,15 @@
import cc.mrbird.febs.common.core.constant.ModuleCode;
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 cc.mrbird.febs.server.hr.entity.EmpUnemployment;
import cc.mrbird.febs.server.hr.mapper.EmpUnemploymentMapper;
import cc.mrbird.febs.server.hr.service.IEmpUnemploymentService;
+import cn.hutool.core.date.DateUtil;
import lombok.RequiredArgsConstructor;
/**
@@ -39,6 +47,7 @@
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class EmpUnemploymentServiceImpl extends ServiceImpl<EmpUnemploymentMapper, EmpUnemployment> implements IEmpUnemploymentService {
+ private final RedisService redisService;
private final EmpUnemploymentMapper empUnemploymentMapper;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
@@ -79,7 +88,14 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void createEmpUnemployment(EmpUnemployment empUnemployment) {
+ public void createEmpUnemployment(EmpUnemployment empUnemployment) throws FebsException {
+ LambdaQueryWrapper<EmpUnemployment> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(EmpUnemployment::getEmpId, empUnemployment.getEmpId());
+ lambdaQueryWrapper.eq(EmpUnemployment::getApplayDate,empUnemployment.getApplayDate() );
+ lambdaQueryWrapper.ne(EmpUnemployment::getDelFlag,1);
+ if (this.count(lambdaQueryWrapper) > 0) {
+ throw new FebsException(MyConstant.MESSAGE);
+ }
empUnemployment.setUnemploymentId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
empUnemployment.setCreator(operatorId);
empUnemployment.setModifier(operatorId);
@@ -88,7 +104,15 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void updateEmpUnemployment(EmpUnemployment empUnemployment) {
+ public void updateEmpUnemployment(EmpUnemployment empUnemployment) throws FebsException {
+ LambdaQueryWrapper<EmpUnemployment> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(EmpUnemployment::getEmpId, empUnemployment.getEmpId());
+ lambdaQueryWrapper.eq(EmpUnemployment::getApplayDate, empUnemployment.getApplayDate());
+ lambdaQueryWrapper.ne(EmpUnemployment::getDelFlag,1);
+ lambdaQueryWrapper.ne(EmpUnemployment::getUnemploymentId,empUnemployment.getUnemploymentId());
+ if (this.count(lambdaQueryWrapper) > 0) {
+ throw new FebsException(MyConstant.MESSAGE);
+ }
EmpUnemployment dbData = this.getById(empUnemployment.getUnemploymentId());
empUnemployment.setCreateTime(dbData.getCreateTime());
empUnemployment.setCreator(dbData.getCreator());
@@ -129,4 +153,37 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
return empUnemploymentMapper.momentToNormal(list, operatorId)>0;
}
-}
\ No newline at end of file
+
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void importEmpUnemployment(List<List<Object>> listObject,List<String> returnList) {
+ for (List<Object> list : listObject) {
+ if (list.size()==0){
+ continue;
+ }
+ EmpUnemployment empUnemployment=new EmpUnemployment();
+ empUnemployment.setUnemploymentId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ empUnemployment.setEmpNumb(list.get(0).toString());
+ List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
+ Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(3).toString())).findFirst().orElse(null);
+ if (null == dept) {
+ returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list),list.get(3).toString()));
+ continue;
+ }
+ empUnemployment.setDeptName(list.get(1).toString());
+ empUnemployment.setDeptId(dept.getDeptId());
+ empUnemployment.setJobName(list.get(2).toString());
+ empUnemployment.setEmpName(list.get(3).toString());
+ empUnemployment.setCertificateNumb(list.get(4).toString());
+ if (StringUtils.isNotBlank(list.get(5).toString())) {
+ empUnemployment.setApplayDate(DateUtil.parseDate(list.get(5).toString()));
+ }
+ empUnemployment.setApplayReason(list.get(6).toString());
+ empUnemployment.setReporter(list.get(7).toString());
+ empUnemployment.setAuditor(list.get(8).toString());
+ empUnemployment.setRemark(list.get(9).toString());
+ this.save(empUnemployment);
+ }
+ }
+}
--
Gitblit v1.8.0