From e44b9ade0ee02b1ccb3e2ef3748b0ef5f1740b5d Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期二, 16 三月 2021 22:12:08 +0800
Subject: [PATCH] 修改导出
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java
index 8f859a3..c5e98bb 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java
@@ -7,7 +7,11 @@
import java.util.List;
import java.util.Optional;
+import cc.mrbird.febs.common.core.constant.DicCode;
+import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
+import cc.mrbird.febs.common.core.entity.system.DicItem;
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.EmpAccidentCases;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
@@ -92,18 +96,24 @@
queryWrapper.eq("a.SettleStatus", empOccupational.getSettleStatus());
}
if (StringUtils.isNotBlank(empOccupational.getEmpStatus())) {
- queryWrapper.eq("a.EmpStatus", empOccupational.getEmpStatus());
+ queryWrapper.in("a.EmpStatus", empOccupational.getEmpStatus().split(","));
}
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpOccupational> page = new Page<>(request.getPageNum(), request.getPageSize());
- return empOccupationalMapper.selectPageVo(page, queryWrapper);
+ SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
+ IPage<EmpOccupational> pageList = empOccupationalMapper.selectPageVo(page, queryWrapper);
+ List<EmpOccupational> list = pageList.getRecords();
+ //处理数据字典
+ pageList.setRecords(covertDicItemName(list));
+ return pageList;
}
@Override
public List<EmpOccupational> findEmpOccupationals(EmpOccupational empOccupational) {
LambdaQueryWrapper<EmpOccupational> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(EmpOccupational::getDelFlag, empOccupational.getDelFlag());
- return this.baseMapper.selectList(queryWrapper);
+ List<EmpOccupational> list = this.baseMapper.selectList(queryWrapper);
+ return covertDicItemName(list);
}
@Override
@@ -180,7 +190,7 @@
@Transactional(rollbackFor = Exception.class)
public void importEmpOccupational(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;
}
EmpOccupational empOccupational=new EmpOccupational();
@@ -246,4 +256,18 @@
this.save(empOccupational);
}
}
+
+ private List<EmpOccupational> covertDicItemName(List<EmpOccupational> list){
+ List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
+ list.parallelStream().forEachOrdered(p -> {
+ // 设置结案状态
+ p.setSettleStatusName(dicItems.stream()
+ .filter(k -> DicCode.SETTLE_STATUS.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getSettleStatus().toString()))
+ .findFirst()
+ .map(DicItem::getDicItemName)
+ .orElse(""));
+ });
+
+ return list;
+ }
}
--
Gitblit v1.8.0