From 455bf65a36ce1e9b6c24eb5c86a8eb69eaea8003 Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期四, 04 三月 2021 00:19:47 +0800
Subject: [PATCH] 增加员工基本信息，工作经历的关联查询
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 50 insertions(+), 8 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java
index dc62336..de8f910 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java
@@ -17,9 +17,13 @@
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.math.BigDecimal;
import java.util.*;
/**
@@ -36,6 +40,7 @@
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class EmpDimissionAttendServiceImpl extends ServiceImpl<EmpDimissionAttendMapper, EmpDimissionAttend> implements IEmpDimissionAttendService {
+ private final RedisService redisService;
private final EmpDimissionAttendMapper empDimissionattendMapper;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
@@ -46,25 +51,25 @@
LambdaQueryWrapper<EmpDimissionAttend> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(EmpDimissionAttend::getDelFlag, empDimissionattend.getDelFlag());
if (StringUtils.isNotBlank(empDimissionattend.getEmpNumb())) {
- queryWrapper.eq(EmpDimissionAttend::getEmpNumb, empDimissionattend.getEmpNumb());
+ queryWrapper.like(EmpDimissionAttend::getEmpNumb, empDimissionattend.getEmpNumb());
}
if (StringUtils.isNotBlank(empDimissionattend.getEmpName())) {
- queryWrapper.eq(EmpDimissionAttend::getEmpName, empDimissionattend.getEmpName());
+ queryWrapper.like(EmpDimissionAttend::getEmpName, empDimissionattend.getEmpName());
}
if (StringUtils.isNotBlank(empDimissionattend.getCertificateNumb())) {
- queryWrapper.eq(EmpDimissionAttend::getCertificateNumb, empDimissionattend.getCertificateNumb());
+ queryWrapper.like(EmpDimissionAttend::getCertificateNumb, empDimissionattend.getCertificateNumb());
}
if (StringUtils.isNotBlank(empDimissionattend.getDeptName())) {
- queryWrapper.eq(EmpDimissionAttend::getDeptName, empDimissionattend.getDeptName());
+ queryWrapper.like(EmpDimissionAttend::getDeptName, empDimissionattend.getDeptName());
}
if (StringUtils.isNotBlank(empDimissionattend.getAttendYear())) {
- queryWrapper.eq(EmpDimissionAttend::getAttendYear, empDimissionattend.getAttendYear());
+ queryWrapper.like(EmpDimissionAttend::getAttendYear, empDimissionattend.getAttendYear());
}
if (StringUtils.isNotBlank(empDimissionattend.getAttendMonth())) {
- queryWrapper.eq(EmpDimissionAttend::getAttendMonth, empDimissionattend.getAttendMonth());
+ queryWrapper.like(EmpDimissionAttend::getAttendMonth, empDimissionattend.getAttendMonth());
}
if (StringUtils.isNotBlank(empDimissionattend.getDeductStr())) {
- queryWrapper.eq(EmpDimissionAttend::getDeduct, empDimissionattend.getDeductStr());
+ queryWrapper.like(EmpDimissionAttend::getDeduct, empDimissionattend.getDeductStr());
}
if (StringUtils.isNotBlank(empDimissionattend.getEmpStatus())) {
queryWrapper.eq(EmpDimissionAttend::getEmpStatus, empDimissionattend.getEmpStatus());
@@ -132,4 +137,41 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
return empDimissionattendMapper.momentToNormal(list, operatorId)>0;
}
-}
\ No newline at end of file
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void importEmpDimissionAttend(List<List<Object>> listObject,List<String> returnList) {
+ for (List<Object> list : listObject) {
+ EmpDimissionAttend dimissionAttend = new EmpDimissionAttend();
+ dimissionAttend.setDimissionAttendId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ dimissionAttend.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();
+ dimissionAttend.setDeptName(list.get(1).toString());
+ dimissionAttend.setDeptId(deptId);
+ dimissionAttend.setJobName(list.get(2).toString());
+ dimissionAttend.setEmpName(list.get(3).toString());
+ dimissionAttend.setCertificateNumb(list.get(4).toString());
+ dimissionAttend.setAttendMonth(list.get(5).toString());
+ if (StringUtils.isNotBlank(list.get(6).toString())) {
+ dimissionAttend.setAttendDays(new BigDecimal(list.get(6).toString()));
+ }
+ if (StringUtils.isNotBlank(list.get(7).toString())) {
+ dimissionAttend.setOvertimeDay(new BigDecimal(list.get(7).toString()));
+ }
+ if (StringUtils.isNotBlank(list.get(8).toString())) {
+ dimissionAttend.setOvertimeHour(new BigDecimal(list.get(8).toString()));
+ }
+ dimissionAttend.setDeduct(list.get(9).toString());
+ if (StringUtils.isNotBlank(list.get(10).toString())) {
+ dimissionAttend.setLeaveDay(new BigDecimal(list.get(10).toString()));
+ }
+ if (StringUtils.isNotBlank(list.get(11).toString())) {
+ dimissionAttend.setAbsenteeism(new BigDecimal(list.get(11).toString()));
+ }
+ dimissionAttend.setRemark(list.get(12).toString());
+ this.save(dimissionAttend);
+ }
+ }
+}
--
Gitblit v1.8.0