From 736b58a43b0afb40745f885f400ef97d070f46a9 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期四, 04 三月 2021 22:02:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 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 05276f3..b01e878 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
@@ -11,6 +11,7 @@
import cc.mrbird.febs.common.core.entity.system.DicItem;
import cc.mrbird.febs.common.core.utils.CastUtil;
import cc.mrbird.febs.common.redis.service.RedisService;
+import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cn.hutool.core.util.StrUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@@ -52,6 +53,7 @@
private final RedisService redisService;
private final EmpContractInfoMapper empContractinfoMapper;
private final IRemoteDeptService remoteDeptService;
+ private final IEmpBaseInfoService empBaseInfoService;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
.orElse("1");
@@ -175,11 +177,18 @@
contractInfo.setContractId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
contractInfo.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);
+ 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;
}
+ Long empId = empBaseInfoService.getEmpIdByEmpNumb(list.get(0).toString());
+ if (null == empId){
+ returnList.add(StrUtil.format("导入员工合同信息异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
+ continue;
+ }
+ contractInfo.setDelFlag(2);
+ contractInfo.setEmpId(empId);
contractInfo.setDeptName(list.get(1).toString());
contractInfo.setDeptId(dept.getDeptId());
contractInfo.setJobName(list.get(2).toString());
@@ -188,15 +197,20 @@
if (StringUtils.isNotBlank(list.get(5).toString())) {
contractInfo.setSigningDate(DateUtil.parseDate(list.get(5).toString()));
}
- if (StringUtils.isNotBlank(list.get(6).toString())) {
- contractInfo.setEndDate(DateUtil.parseDate(list.get(6).toString()));
- }
+ if (StringUtils.isNotBlank(list.get(6).toString())) {
+ contractInfo.setBeginDate(DateUtil.parseDate(list.get(6).toString()));
+ }
+
if (StringUtils.isNotBlank(list.get(7).toString())) {
- contractInfo.setContractPeriod(Integer.valueOf(list.get(7).toString()));
+ contractInfo.setEndDate(DateUtil.parseDate(list.get(7).toString()));
}
- contractInfo.setContractStatus(list.get(8).toString());
- contractInfo.setTransactor(list.get(9).toString());
- contractInfo.setRemark(list.get(10).toString());
+ if (StringUtils.isNotBlank(list.get(8).toString())) {
+ contractInfo.setContractPeriod(Integer.valueOf(list.get(8).toString()));
+ }
+ contractInfo.setContractStatus(list.get(9).toString());
+ contractInfo.setTransactor(list.get(10).toString());
+ contractInfo.setRemark(list.get(11).toString());
+
this.save(contractInfo);
}
}
--
Gitblit v1.8.0