From 2467978ddf7cbd4624e5d2515ffe3c089dbfd310 Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期三, 17 三月 2021 02:45:29 +0800
Subject: [PATCH] 备注导出日期修改为没有时分秒格式，员工信息增加入离职类型的导出
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.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/EmpUnemploymentServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java
index 8c5953e..254e5ae 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java
@@ -6,7 +6,9 @@
import java.util.List;
import java.util.Optional;
+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.service.IEmpBaseInfoService;
@@ -81,8 +83,12 @@
if (StringUtils.isNotBlank(empUnemployment.getApplayReason())) {
queryWrapper.like("a.ApplayReason", empUnemployment.getApplayReason());
}
+ if (StringUtils.isNotBlank(empUnemployment.getEmpStatus())) {
+ queryWrapper.in("b.EmpStatus", empUnemployment.getEmpStatus().split(","));
+ }
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpUnemployment> page = new Page<>(request.getPageNum(), request.getPageSize());
+ SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
return empUnemploymentMapper.selectPageVo(page, queryWrapper);
}
@@ -166,7 +172,7 @@
@Transactional(rollbackFor = Exception.class)
public void importEmpUnemployment(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;
}
EmpUnemployment empUnemployment=new EmpUnemployment();
--
Gitblit v1.8.0