From b7e12f6bfcf7d42169dffa5f169843e714833b6a Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 23 四月 2021 12:05:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java
index d785e3d..1b3a2fd 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java
@@ -1,7 +1,9 @@
package cc.mrbird.febs.server.hr.service.impl;
import cc.mrbird.febs.common.core.constant.ModuleCode;
+import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
import cc.mrbird.febs.common.core.exception.FebsException;
+import cc.mrbird.febs.common.core.utils.SortUtil;
import cc.mrbird.febs.server.hr.constant.MyConstant;
import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
import cc.mrbird.febs.server.hr.entity.EmpResign;
@@ -81,10 +83,9 @@
}
if (StringUtils.isNotBlank(empResign.getEmpStatus())) {
queryWrapper.in("b.EmpStatus", empResign.getEmpStatus().split(","));
- } else {
- queryWrapper.in("b.EmpStatus", 0);
}
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
+ SortUtil.handlePageSort(request, page, "applayDate", FebsConstant.ORDER_ASC, true);
return empResignMapper.selectPageVo(page, queryWrapper);
}
@@ -167,13 +168,16 @@
@Transactional(rollbackFor = Exception.class)
public void importEmpResign(List<List<Object>> listObject,List<String> returnList) {
for (List<Object> list : listObject) {
- if (list.size()==0){
+ if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
continue;
}
EmpResign resign = new EmpResign();
resign.setResignId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
resign.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()));
@@ -184,7 +188,7 @@
returnList.add(StrUtil.format("导入员工辞职申请异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
continue;
}
- resign.setDelFlag(2);
+ resign.setDelFlag(0);
resign.setEmpId(empId);
resign.setDeptName(list.get(1).toString());
resign.setDeptId(dept.getDeptId());
--
Gitblit v1.8.0