From 3014d7c96c13c7e032d5a7dfee7faf193afc557f Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期二, 23 三月 2021 22:16:32 +0800
Subject: [PATCH] 修改导入
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java | 55 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 15 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 c163d46..5202bb5 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
@@ -1,12 +1,17 @@
package cc.mrbird.febs.server.hr.service.impl;
import cc.mrbird.febs.common.core.constant.ModuleCode;
+import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
+import cc.mrbird.febs.common.core.utils.SortUtil;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.entity.EmpDimissionAttend;
+import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.entity.EmpDimissionAttend;
import cc.mrbird.febs.server.hr.mapper.EmpDimissionAttendMapper;
+import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cc.mrbird.febs.server.hr.service.IEmpDimissionAttendService;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@@ -14,10 +19,12 @@
import org.springframework.transaction.annotation.Propagation;
import lombok.RequiredArgsConstructor;
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.entity.constant.StringConstant;
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;
@@ -43,40 +50,44 @@
private final RedisService redisService;
private final EmpDimissionAttendMapper empDimissionattendMapper;
+ private final IRemoteDeptService remoteDeptService;
+ private final IEmpBaseInfoService empBaseInfoService;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
.orElse("1");
@Override
public IPage<EmpDimissionAttend> findEmpDimissionattends(QueryRequest request, EmpDimissionAttend empDimissionattend) {
- LambdaQueryWrapper<EmpDimissionAttend> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpDimissionAttend::getDelFlag, empDimissionattend.getDelFlag());
+ QueryWrapper<EmpDimissionAttend> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("a.DelFlag", empDimissionattend.getDelFlag());
if (StringUtils.isNotBlank(empDimissionattend.getEmpNumb())) {
- queryWrapper.like(EmpDimissionAttend::getEmpNumb, empDimissionattend.getEmpNumb());
+ queryWrapper.like("a.EmpNumb", empDimissionattend.getEmpNumb());
}
if (StringUtils.isNotBlank(empDimissionattend.getEmpName())) {
- queryWrapper.like(EmpDimissionAttend::getEmpName, empDimissionattend.getEmpName());
+ queryWrapper.like("a.EmpName", empDimissionattend.getEmpName());
}
if (StringUtils.isNotBlank(empDimissionattend.getCertificateNumb())) {
- queryWrapper.like(EmpDimissionAttend::getCertificateNumb, empDimissionattend.getCertificateNumb());
+ queryWrapper.like("a.CertificateNumb", empDimissionattend.getCertificateNumb());
}
if (StringUtils.isNotBlank(empDimissionattend.getDeptName())) {
- queryWrapper.like(EmpDimissionAttend::getDeptName, empDimissionattend.getDeptName());
+ queryWrapper.like("a.DeptName", empDimissionattend.getDeptName());
}
if (StringUtils.isNotBlank(empDimissionattend.getAttendYear())) {
- queryWrapper.like(EmpDimissionAttend::getAttendYear, empDimissionattend.getAttendYear());
+ queryWrapper.like("a.AttendYear", empDimissionattend.getAttendYear());
}
if (StringUtils.isNotBlank(empDimissionattend.getAttendMonth())) {
- queryWrapper.like(EmpDimissionAttend::getAttendMonth, empDimissionattend.getAttendMonth());
+ queryWrapper.like("a.AttendMonth", empDimissionattend.getAttendMonth());
}
if (StringUtils.isNotBlank(empDimissionattend.getDeductStr())) {
- queryWrapper.like(EmpDimissionAttend::getDeduct, empDimissionattend.getDeductStr());
+ queryWrapper.like("a.Deduct", empDimissionattend.getDeductStr());
}
if (StringUtils.isNotBlank(empDimissionattend.getEmpStatus())) {
- queryWrapper.eq(EmpDimissionAttend::getEmpStatus, empDimissionattend.getEmpStatus());
+ queryWrapper.in("a.EmpStatus", empDimissionattend.getEmpStatus().split(","));
}
+ queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpDimissionAttend> page = new Page<>(request.getPageNum(), request.getPageSize());
- return this.page(page, queryWrapper);
+ SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
+ return empDimissionattendMapper.selectPageVo(page, queryWrapper);
}
@Override
@@ -143,24 +154,37 @@
@Transactional(rollbackFor = Exception.class)
public void importEmpDimissionAttend(List<List<Object>> listObject,List<String> returnList) {
for (List<Object> list : listObject) {
- if (list.size()==0){
+ if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
continue;
}
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);
- Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(3).toString())).findFirst().orElse(null);
+ 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),list.get(3).toString()));
+ returnList.add(StrUtil.format("导入离职当月考勤异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list)+1,list.get(1).toString()));
continue;
}
+ EmpBaseInfo empBaseInfo = empBaseInfoService.getEmpBaseInfoByEmpNumb(list.get(0).toString());
+ if (null == empBaseInfo){
+ returnList.add(StrUtil.format("导入离职当月考勤异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
+ continue;
+ }
+ dimissionAttend.setDelFlag(2);
+ dimissionAttend.setEmpId(empBaseInfo.getEmpId());
dimissionAttend.setDeptName(list.get(1).toString());
dimissionAttend.setDeptId(dept.getDeptId());
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(5).toString())){
+ dimissionAttend.setAttendMonth(DateUtil.formatDate(DateUtil.parse(list.get(5).toString())));
+ }
+
if (StringUtils.isNotBlank(list.get(6).toString())) {
dimissionAttend.setAttendDays(new BigDecimal(list.get(6).toString()));
}
@@ -178,6 +202,7 @@
dimissionAttend.setAbsenteeism(new BigDecimal(list.get(11).toString()));
}
dimissionAttend.setRemark(list.get(12).toString());
+ dimissionAttend.setEmpStatus(empBaseInfo.getEmpStatus());
this.save(dimissionAttend);
}
}
--
Gitblit v1.8.0