From 1f5fe83df4d02e221fa57dd246a988b32ab02584 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期二, 09 三月 2021 18:09:43 +0800
Subject: [PATCH] fix(bug修复): 导出Excel
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
index 8715199..7db346e 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
@@ -88,7 +88,7 @@
queryWrapper.eq("a.ArbitrationStatus", empLabortrouble.getArbitrationStatus());
}
if (StringUtils.isNotBlank(empLabortrouble.getEmpStatus())) {
- queryWrapper.eq("a.EmpStatus", empLabortrouble.getEmpStatus());
+ queryWrapper.in("a.EmpStatus", empLabortrouble.getEmpStatus().split(","));
}
if (StringUtils.isNotBlank(empLabortrouble.getArbitrationReason())) {
queryWrapper.like("a.ArbitrationReason", empLabortrouble.getArbitrationReason());
@@ -191,13 +191,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;
}
empLabortrouble.setDelFlag(2);
- empLabortrouble.setEmpId(empId);
+ empLabortrouble.setEmpId(empBaseInfo.getEmpId());
empLabortrouble.setDeptName(list.get(1).toString());
empLabortrouble.setDeptId(dept.getDeptId());
empLabortrouble.setJobName(list.get(2).toString());
@@ -219,6 +219,7 @@
if (StringUtils.isNotBlank(list.get(12).toString())) {
empLabortrouble.setSettleDate(DateUtil.parseDate(list.get(12).toString()));
}
+ empLabortrouble.setEmpStatus(empBaseInfo.getEmpStatus());
this.save(empLabortrouble);
}
}
--
Gitblit v1.8.0