From 551fe577e2e6b8cfc84b17fbc38b95f41c07ad00 Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期六, 06 三月 2021 17:26:26 +0800
Subject: [PATCH] 员工查询条件关系修改
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 2db1b1e..41b697e 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
@@ -48,6 +48,7 @@
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");
@@ -161,13 +162,13 @@
returnList.add(StrUtil.format("导入离职当月考勤异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list)+1,list.get(1).toString()));
continue;
}
- Long empId = empBaseInfoService.getEmpIdByEmpNumb(list.get(0).toString());
- if (null == empId){
+ 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(empId);
+ dimissionAttend.setEmpId(empBaseInfo.getEmpId());
dimissionAttend.setDeptName(list.get(1).toString());
dimissionAttend.setDeptId(dept.getDeptId());
dimissionAttend.setJobName(list.get(2).toString());
@@ -191,6 +192,7 @@
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