From fb9823428a7705d8ed8e2f4128e525df3781e968 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期二, 03 八月 2021 10:21:09 +0800
Subject: [PATCH] fix(bug修复): 导入的新员工增加了入离职记录；重新处理了导入的日期格式
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java | 79 +++++++++++++++++++++------------------
1 files changed, 42 insertions(+), 37 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
index f608557..beb237c 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
@@ -1,42 +1,36 @@
package cc.mrbird.febs.server.hr.service.impl;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Optional;
-
import cc.mrbird.febs.common.core.constant.DicCode;
+import cc.mrbird.febs.common.core.constant.ModuleCode;
+import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
import cc.mrbird.febs.common.core.entity.system.Dept;
import cc.mrbird.febs.common.core.entity.system.DicItem;
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.core.utils.SortUtil;
import cc.mrbird.febs.common.redis.service.RedisService;
+import cc.mrbird.febs.server.hr.entity.EmpContractInfo;
+import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
+import cc.mrbird.febs.server.hr.mapper.EmpContractInfoMapper;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
+import cc.mrbird.febs.server.hr.service.IEmpContractInfoService;
+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.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-
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.constant.ModuleCode;
-import cc.mrbird.febs.common.core.entity.QueryRequest;
-import cc.mrbird.febs.common.core.entity.constant.StringConstant;
-import cc.mrbird.febs.common.core.utils.FebsUtil;
-import cc.mrbird.febs.common.core.utils.SequenceUtil;
-import cc.mrbird.febs.server.hr.entity.EmpContractInfo;
-import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
-import cc.mrbird.febs.server.hr.mapper.EmpContractInfoMapper;
-import cc.mrbird.febs.server.hr.service.IEmpContractInfoService;
-import cn.hutool.core.date.DateUtil;
import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
/**
* name:EmpContractinfo
@@ -74,7 +68,7 @@
queryWrapper.like("a.CertificateNumb", empContractinfo.getCertificateNumb());
}
if (StringUtils.isNotBlank(empContractinfo.getDeptName())) {
- queryWrapper.like("a.DeptName", empContractinfo.getDeptName());
+ queryWrapper.like("b.allDeptName", empContractinfo.getDeptName());
}
if (StringUtils.isNotBlank(empContractinfo.getSigningDateStr())) {
queryWrapper.between("a.SigningDate", empContractinfo.getSigningDateStr().split(",")[0], empContractinfo.getSigningDateStr().split(",")[1]);
@@ -82,14 +76,14 @@
if (StringUtils.isNotBlank(empContractinfo.getEndDateStr())) {
queryWrapper.between("a.EndDate", empContractinfo.getEndDateStr().split(",")[0], empContractinfo.getEndDateStr().split(",")[1]);
}
- if (StringUtils.isNotBlank(empContractinfo.getDeptName())) {
- queryWrapper.in("a.deptName", empContractinfo.getDeptName());
- }
+ // if (StringUtils.isNotBlank(empContractinfo.getDeptName())) {
+ // queryWrapper.in("a.deptName", empContractinfo.getDeptName());
+ // }
if (StringUtils.isNotBlank(empContractinfo.getContractStatus())) {
queryWrapper.eq("a.ContractStatus", empContractinfo.getContractStatus());
}
if (StringUtils.isNotBlank(empContractinfo.getEmpStatus())) {
- queryWrapper.in("a.EmpStatus", empContractinfo.getEmpStatus().split(","));
+ queryWrapper.in("b.EmpStatus", empContractinfo.getEmpStatus().split(","));
}
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpContractInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
@@ -199,25 +193,31 @@
returnList.add(StrUtil.format("导入员工合同信息异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
continue;
}
- contractInfo.setDelFlag(2);
+ contractInfo.setDelFlag(0);
contractInfo.setEmpId(empId);
contractInfo.setDeptName(list.get(1).toString());
contractInfo.setDeptId(dept.getDeptId());
contractInfo.setJobName(list.get(2).toString());
contractInfo.setEmpName(list.get(3).toString());
contractInfo.setCertificateNumb(list.get(4).toString());
- if (StringUtils.isNotBlank(list.get(5).toString())) {
- contractInfo.setSigningDate(DateUtil.parseDate(list.get(5).toString()));
- }
- if (StringUtils.isNotBlank(list.get(6).toString())) {
- contractInfo.setBeginDate(DateUtil.parseDate(list.get(6).toString()));
+ try {
+ if (StringUtils.isNotBlank(list.get(5).toString())) {
+ contractInfo.setSigningDate(DateUtil.parse(list.get(5).toString()));
+ }
+ if (StringUtils.isNotBlank(list.get(6).toString())) {
+ contractInfo.setBeginDate(DateUtil.parse(list.get(6).toString()));
+ }
+
+ if (StringUtils.isNotBlank(list.get(7).toString())) {
+ contractInfo.setEndDate(DateUtil.parse(list.get(7).toString()));
+ }
+ }catch (Exception e){
+ returnList.add(StrUtil.format("导入员工合同信息异常: 出现位置第{}行, 原因:{}时间格式错误",listObject.indexOf(list)+1,list.get(0).toString()));
+ continue;
}
- if (StringUtils.isNotBlank(list.get(7).toString())) {
- contractInfo.setEndDate(DateUtil.parseDate(list.get(7).toString()));
- }
if (StringUtils.isNotBlank(list.get(8).toString())) {
- contractInfo.setContractPeriod(Integer.valueOf(list.get(8).toString()));
+ contractInfo.setContractPeriod(Float.valueOf(list.get(8).toString()));
}
//合同
DicItem dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"contractStatus")&&StrUtil.equals(j.getDicItemName(),list.get(9).toString())).findFirst().orElse(null);
@@ -239,4 +239,9 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
empContractinfoMapper.terminateContract(list, operatorId);
}
+
+ @Override
+ public void autoStopContract(String operatorId) {
+ empContractinfoMapper.autoStopContract(operatorId);
+ }
}
--
Gitblit v1.8.0