From 352f4d4a3ae3145f2bd43d0802150877349750d6 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期二, 23 三月 2021 10:46:26 +0800
Subject: [PATCH] 修改bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.java
index 27cdec2..cf6d079 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.java
@@ -1,8 +1,13 @@
package cc.mrbird.febs.server.hr.service.impl;
+import cc.mrbird.febs.common.core.constant.DicCode;
import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
+import cc.mrbird.febs.common.core.entity.system.DicItem;
+import cc.mrbird.febs.common.core.utils.CastUtil;
import cc.mrbird.febs.common.core.utils.SortUtil;
+import cc.mrbird.febs.common.redis.service.RedisService;
+import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.entity.EmpJobChange;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpJobChangeMapper;
@@ -41,6 +46,7 @@
private final EmpJobChangeMapper empJobchangeMapper;
private final IRemoteDeptService remoteDeptService;
+ private final RedisService redisService;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
.orElse("1");
@@ -69,13 +75,24 @@
}
if (StringUtils.isNotBlank(empJobchange.getEmpStatus())) {
queryWrapper.in("b.EmpStatus", empJobchange.getEmpStatus().split(","));
- } else {
- queryWrapper.in("b.EmpStatus", 0);
}
Page<EmpJobChange> page = new Page<>(request.getPageNum(), request.getPageSize());
SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
- return this.baseMapper.selectPageVo(page, queryWrapper);
+ IPage<Map<String,Object>> iPage = this.baseMapper.selectPageVo(page, queryWrapper);
+ List<Map<String,Object>> list =iPage.getRecords();
+ List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
+ list.forEach(p->{
+ String jobChangeTypeName = dicItems.stream()
+ .filter(k -> DicCode.JOB_CHANGE_TYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.get("changeType")))
+ .findFirst()
+ .map(DicItem::getDicItemName)
+ .orElse("未知");
+ p.put("changeTypeName", jobChangeTypeName);
+ });
+ iPage.setRecords(list);
+ return iPage;
+
}
@Override
--
Gitblit v1.8.0