From 925e4fede2cfd37fa5526bf942f9264bde6d7bcb Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期三, 17 三月 2021 03:01:55 +0800
Subject: [PATCH] 调岗记录导出部门修改为部门全称
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 ba4d5e9..63aee81 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;
@@ -79,7 +81,11 @@
if (StringUtils.isNotBlank(empResign.getReason())) {
queryWrapper.like("a.Reason", empResign.getReason());
}
+ if (StringUtils.isNotBlank(empResign.getEmpStatus())) {
+ queryWrapper.in("b.EmpStatus", empResign.getEmpStatus().split(","));
+ }
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
+ SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
return empResignMapper.selectPageVo(page, queryWrapper);
}
@@ -162,7 +168,7 @@
@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();
--
Gitblit v1.8.0