From 2373057023decf149fa9a9850875a4f543f3d76d Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 26 二月 2021 14:31:44 +0800
Subject: [PATCH] fix(bug修复): 基本信息录入
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java | 49 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
index 6bdef10..b39e144 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.hr.service.impl;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
@@ -18,11 +19,16 @@
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.EmpDimissionAttend;
import cc.mrbird.febs.server.hr.entity.EmpLeaveInfo;
import cc.mrbird.febs.server.hr.mapper.EmpLeaveInfoMapper;
import cc.mrbird.febs.server.hr.service.IEmpLeaveInfoService;
+import cn.hutool.core.date.DateUtil;
import lombok.RequiredArgsConstructor;
/**
@@ -39,6 +45,7 @@
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class EmpLeaveInfoServiceImpl extends ServiceImpl<EmpLeaveInfoMapper, EmpLeaveInfo> implements IEmpLeaveInfoService {
+ private final RedisService redisService;
private final EmpLeaveInfoMapper empLeaveinfoMapper;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
@@ -49,16 +56,16 @@
LambdaQueryWrapper<EmpLeaveInfo> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(EmpLeaveInfo::getDelFlag, empLeaveinfo.getDelFlag());
if (StringUtils.isNotBlank(empLeaveinfo.getEmpNumb())) {
- queryWrapper.eq(EmpLeaveInfo::getEmpNumb, empLeaveinfo.getEmpNumb());
+ queryWrapper.like(EmpLeaveInfo::getEmpNumb, empLeaveinfo.getEmpNumb());
}
if (StringUtils.isNotBlank(empLeaveinfo.getEmpName())) {
- queryWrapper.eq(EmpLeaveInfo::getEmpName, empLeaveinfo.getEmpName());
+ queryWrapper.like(EmpLeaveInfo::getEmpName, empLeaveinfo.getEmpName());
}
if (StringUtils.isNotBlank(empLeaveinfo.getCertificateNumb())) {
- queryWrapper.eq(EmpLeaveInfo::getCertificateNumb, empLeaveinfo.getCertificateNumb());
+ queryWrapper.like(EmpLeaveInfo::getCertificateNumb, empLeaveinfo.getCertificateNumb());
}
if (StringUtils.isNotBlank(empLeaveinfo.getDeptName())) {
- queryWrapper.eq(EmpLeaveInfo::getDeptName, empLeaveinfo.getDeptName());
+ queryWrapper.like(EmpLeaveInfo::getDeptName, empLeaveinfo.getDeptName());
}
if (StringUtils.isNotBlank(empLeaveinfo.getEmpStatus())) {
queryWrapper.eq(EmpLeaveInfo::getEmpStatus, empLeaveinfo.getEmpStatus());
@@ -130,4 +137,38 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
return empLeaveinfoMapper.momentToNormal(list, operatorId)>0;
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void importEmpLeaveInfo(List<List<Object>> listObject) {
+ for (List<Object> list : listObject) {
+ EmpLeaveInfo leaveInfo = new EmpLeaveInfo();
+ leaveInfo.setLeaveId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ leaveInfo.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();
+ leaveInfo.setDeptName(list.get(1).toString());
+ leaveInfo.setDeptId(deptId);
+ leaveInfo.setJobName(list.get(2).toString());
+ leaveInfo.setEmpName(list.get(3).toString());
+ leaveInfo.setCertificateNumb(list.get(4).toString());
+ if (StringUtils.isNotBlank(list.get(5).toString())) {
+ leaveInfo.setBeginTime(DateUtil.parseDate(list.get(5).toString()));
+ }
+ if (StringUtils.isNotBlank(list.get(6).toString())) {
+ leaveInfo.setEndTime(DateUtil.parseDate(list.get(6).toString()));
+ }
+ if (StringUtils.isNotBlank(list.get(7).toString())) {
+ leaveInfo.setLeaveDay(new BigDecimal(list.get(7).toString()));
+ }
+ leaveInfo.setLeaveType(list.get(8).toString());
+ if (StringUtils.isNotBlank(list.get(9).toString())) {
+ leaveInfo.setReturnDate(DateUtil.parseDate(list.get(9).toString()));
+ }
+ leaveInfo.setReporter(list.get(10).toString());
+ leaveInfo.setRemark(list.get(11).toString());
+ this.save(leaveInfo);
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0