From 567a11a82c7168473b75c0d9b82cc56622a61ab6 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 18 三月 2021 07:54:15 +0800
Subject: [PATCH] fix(bug修复): 打开档案时同时写入离职表
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
index 16915f9..5142ddd 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
@@ -7,6 +7,8 @@
import java.util.List;
import java.util.Optional;
+import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
+import cc.mrbird.febs.common.core.utils.SortUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -85,6 +87,7 @@
}
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpLeaveInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
IPage<EmpLeaveInfo> iPage = empLeaveinfoMapper.selectPageVo(page, queryWrapper);
iPage.setRecords(this.convertDicItemName(iPage.getRecords()));
return iPage;
@@ -152,15 +155,18 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void importEmpLeaveInfo(List<List<Object>> listObject,List<String> returnList) {
+ public void importEmpLeaveInfo(List<List<Object>> listObject,List<String> returnList,List<DicItem> dicItems ) {
for (List<Object> list : listObject) {
- if (list.size()==0){
+ if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
continue;
}
EmpLeaveInfo leaveInfo = new EmpLeaveInfo();
leaveInfo.setLeaveId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
leaveInfo.setEmpNumb(list.get(0).toString());
List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
+ if(null == depts){
+ depts =remoteDeptService.setDeptRedis();
+ }
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)+1,list.get(1).toString()));
@@ -187,7 +193,12 @@
if (StringUtils.isNotBlank(list.get(7).toString())) {
leaveInfo.setLeaveDay(new BigDecimal(list.get(7).toString()));
}
- leaveInfo.setLeaveType(list.get(8).toString());
+ //请假类型
+ DicItem dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"leavetype")&&StrUtil.equals(j.getDicItemName(),list.get(8).toString())).findFirst().orElse(null);
+ if (null!=dicItem){
+ leaveInfo.setLeaveType(dicItem.getDicItemCode());
+ }
+
if (StringUtils.isNotBlank(list.get(9).toString())) {
leaveInfo.setReturnDate(DateUtil.parseDate(list.get(9).toString()));
}
--
Gitblit v1.8.0