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/EmpWorkExperienceServiceImpl.java | 44 ++++++++++++++++++++++++++------------------
1 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
index acfc0dc..3d7e62e 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
@@ -1,10 +1,10 @@
package cc.mrbird.febs.server.hr.service.impl;
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.system.Dept;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
import cc.mrbird.febs.common.core.exception.FebsException;
-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;
@@ -16,20 +16,17 @@
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cc.mrbird.febs.server.hr.service.IEmpWorkExperienceService;
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 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.*;
@@ -73,7 +70,7 @@
queryWrapper.like("a.jobContent", empWorkexperience.getJobContent());
}
if (StringUtils.isNotBlank(empWorkexperience.getEmpStatus())) {
- queryWrapper.in("a.EmpStatus", empWorkexperience.getEmpStatus().split(","));
+ queryWrapper.in("b.EmpStatus", empWorkexperience.getEmpStatus().split(","));
} else {
queryWrapper.in("a.EmpStatus", 0);
}
@@ -102,6 +99,11 @@
.orElse("1");
if(!checkRepetitiveData(empWorkexperience)) {
empWorkexperience.setWorkExperienceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ if("1".equals(empWorkexperience.getSex())){
+ empWorkexperience.setSex("男");
+ } else if("2".equals(empWorkexperience.getSex())){
+ empWorkexperience.setSex("女");
+ }
empWorkexperience.setCreator(operatorId);
empWorkexperience.setModifier(operatorId);
this.save(empWorkexperience);
@@ -187,16 +189,22 @@
workExperience.setCertificateNumb(list.get(2).toString());
workExperience.setSex(list.get(3).toString());
workExperience.setWorkUnit(list.get(4).toString());
- if (StringUtils.isNotBlank(list.get(5).toString())) {
- workExperience.setBeginDate(DateUtil.parseDate(list.get(5).toString()));
- }
- if (StringUtils.isNotBlank(list.get(6).toString())) {
- workExperience.setEndDate(DateUtil.parseDate(list.get(6).toString()));
- }
+ try {
+ if (StringUtils.isNotBlank(list.get(5).toString())) {
+ workExperience.setBeginDate(DateUtil.parse(list.get(5).toString()));
+ }
+ if (StringUtils.isNotBlank(list.get(6).toString())) {
+ workExperience.setEndDate(DateUtil.parse(list.get(6).toString()));
+ }
+ }catch (Exception e){
+ returnList.add(StrUtil.format("员工工作经历: 出现位置第{}行, 原因:{}时间格式错误",listObject.indexOf(list)+1,list.get(0).toString()));
+ continue;
+ }
+
workExperience.setJobContent(list.get(7).toString());
workExperience.setCreator(FebsUtil.getUserId());
workExperience.setModifier(FebsUtil.getUserId());
- workExperience.setDelFlag(2);
+ workExperience.setDelFlag(0);
this.save(workExperience);
}
}
--
Gitblit v1.8.0