From 6328f096bc75d835ecf6c25f58f1a452b8800a86 Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期四, 04 三月 2021 02:00:48 +0800
Subject: [PATCH] 数据权限加到考勤情况位置
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java
index bf459e3..f9e62d6 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java
@@ -7,6 +7,7 @@
import java.util.List;
import java.util.Optional;
+import cn.hutool.core.util.StrUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -158,16 +159,22 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void importEmpOccupational(List<List<Object>> listObject) {
+ public void importEmpOccupational(List<List<Object>> listObject,List<String> returnList) {
for (List<Object> list : listObject) {
+ if (list.size()==0){
+ continue;
+ }
EmpOccupational empOccupational=new EmpOccupational();
empOccupational.setOccupationalId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
empOccupational.setEmpNumb(list.get(0).toString());
List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
- Long deptId = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().get()
- .getDeptId();
+ Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(3).toString())).findFirst().orElse(null);
+ if (null == dept) {
+ returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list),list.get(3).toString()));
+ continue;
+ }
empOccupational.setDeptName(list.get(1).toString());
- empOccupational.setDeptId(deptId);
+ empOccupational.setDeptId(dept.getDeptId());
empOccupational.setJobName(list.get(2).toString());
empOccupational.setEmpName(list.get(3).toString());
empOccupational.setCertificateNumb(list.get(4).toString());
@@ -184,7 +191,7 @@
empOccupational.setHospitalizatioFlag("未住院".equals(list.get(12).toString()) ? 0 : 1);
}
if (StringUtils.isNotBlank(list.get(13).toString())) {
- empOccupational.setBedNumb(Integer.valueOf(list.get(14).toString()));
+ empOccupational.setBedNumb(list.get(14).toString());
}
if (StringUtils.isNotBlank(list.get(14).toString())) {
empOccupational.setReportTime(DateUtil.parseDate(list.get(14).toString()));
@@ -212,4 +219,4 @@
this.save(empOccupational);
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0