From 179ace046094b9d84a8596ea78c9702390d5a56b Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 25 三月 2021 15:34:44 +0800
Subject: [PATCH] fix(bug修复): excel导出日期处理
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 114 insertions(+), 5 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 45bbdee..5e36ca7 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,21 +1,37 @@
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;
import org.springframework.transaction.annotation.Transactional;
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;
import cc.mrbird.febs.common.core.utils.SequenceUtil;
+import cc.mrbird.febs.common.redis.service.RedisService;
+import java.math.BigDecimal;
import java.util.*;
/**
@@ -32,23 +48,52 @@
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class EmpDimissionAttendServiceImpl extends ServiceImpl<EmpDimissionAttendMapper, EmpDimissionAttend> implements IEmpDimissionAttendService {
+ 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, 0);
+ QueryWrapper<EmpDimissionAttend> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("a.DelFlag", empDimissionattend.getDelFlag());
+ if (StringUtils.isNotBlank(empDimissionattend.getEmpNumb())) {
+ queryWrapper.like("a.EmpNumb", empDimissionattend.getEmpNumb());
+ }
+ if (StringUtils.isNotBlank(empDimissionattend.getEmpName())) {
+ queryWrapper.like("a.EmpName", empDimissionattend.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empDimissionattend.getCertificateNumb())) {
+ queryWrapper.like("a.CertificateNumb", empDimissionattend.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empDimissionattend.getDeptName())) {
+ queryWrapper.like("a.DeptName", empDimissionattend.getDeptName());
+ }
+ if (StringUtils.isNotBlank(empDimissionattend.getAttendYear())) {
+ queryWrapper.like("a.AttendYear", empDimissionattend.getAttendYear());
+ }
+ if (StringUtils.isNotBlank(empDimissionattend.getAttendMonth())) {
+ queryWrapper.like("a.AttendMonth", empDimissionattend.getAttendMonth());
+ }
+ if (StringUtils.isNotBlank(empDimissionattend.getDeductStr())) {
+ queryWrapper.like("a.Deduct", empDimissionattend.getDeductStr());
+ }
+ if (StringUtils.isNotBlank(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, "attendMonth", FebsConstant.ORDER_ASC, true);
+ return empDimissionattendMapper.selectPageVo(page, queryWrapper);
}
@Override
public List<EmpDimissionAttend> findEmpDimissionattends(EmpDimissionAttend empDimissionattend) {
LambdaQueryWrapper<EmpDimissionAttend> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpDimissionAttend::getDelFlag, 0);
+ queryWrapper.eq(EmpDimissionAttend::getDelFlag, empDimissionattend.getDelFlag());
return this.baseMapper.selectList(queryWrapper);
}
@@ -97,4 +142,68 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
empDimissionattendMapper.logicDeleteByIds(list, operatorId);
}
-}
\ No newline at end of file
+
+ @Override
+ public boolean momentToNormal(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ return empDimissionattendMapper.momentToNormal(list, operatorId)>0;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void importEmpDimissionAttend(List<List<Object>> listObject,List<String> returnList) {
+ for (List<Object> list : listObject) {
+ 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);
+ 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;
+ }
+ 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());
+ 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()));
+ }
+ 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());
+ dimissionAttend.setEmpStatus(empBaseInfo.getEmpStatus());
+ this.save(dimissionAttend);
+ }
+ }
+}
--
Gitblit v1.8.0