From cad1de1d4ff43f3d1cadb10195b40517c0ba28cd Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 26 二月 2021 19:57:55 +0800
Subject: [PATCH] fix(bug修复): 基本信息录入
---
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/constant/DicCode.java | 5 +++++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java | 31 ++++++++++++++++++++++++++++++-
febs-server/febs-server-hr/src/main/resources/bootstrap.yml | 2 +-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java | 5 +++++
4 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/constant/DicCode.java b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/constant/DicCode.java
index 32fb137..d6a6456 100644
--- a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/constant/DicCode.java
+++ b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/constant/DicCode.java
@@ -57,4 +57,9 @@
* 保险类型
*/
public final static String INSURANCETYPE = "INSURANCETYPE";
+
+ /**
+ * 请假类型
+ */
+ public final static String LEAVETYPE = "LEAVETYPE";
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java
index 9e15844..1f0fb2c 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java
@@ -110,6 +110,11 @@
@ExcelField(value = "请假类型", writeConverterExp = "1=事假,2=病假")
private String leaveType = "";
+ @FieldInfo(name = "leaveTypeName", type = "varchar", explain = "请假类型")
+ @TableField(exist = false)
+ private String leaveTypeName = "";
+
+
@FieldInfo(name = "leaveDay", type = "decimal", explain = "请假天数")
@TableField("leaveDay")
@ExcelField(value = "请假天数")
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
index b39e144..afbd66d 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
@@ -7,6 +7,9 @@
import java.util.List;
import java.util.Optional;
+import cc.mrbird.febs.common.core.constant.DicCode;
+import cc.mrbird.febs.common.core.entity.system.DicItem;
+import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -30,6 +33,7 @@
import cc.mrbird.febs.server.hr.service.IEmpLeaveInfoService;
import cn.hutool.core.date.DateUtil;
import lombok.RequiredArgsConstructor;
+import sun.plugin2.ipc.IPCFactory;
/**
* name:EmpLeaveinfo
@@ -75,7 +79,9 @@
queryWrapper.le(EmpLeaveInfo::getEndTime, empLeaveinfo.getLeaveDateStr().split(",")[1]);
}
Page<EmpLeaveInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
- return this.page(page, queryWrapper);
+ IPage<EmpLeaveInfo> iPage = this.page(page, queryWrapper);
+ iPage.setRecords(this.convertDicItemName(iPage.getRecords()));
+ return iPage;
}
@Override
@@ -171,4 +177,27 @@
this.save(leaveInfo);
}
}
+
+ /**
+ *
+ * 将列表中的字典项转换成字典名称
+ *
+ * date 2021-02-26 19:37
+ * @author: luoyibo
+ * @param list 1
+ * @return java.util.List<cc.mrbird.febs.server.hr.entity.EmpLeaveInfo>
+ */
+ private List<EmpLeaveInfo> convertDicItemName(List<EmpLeaveInfo> list){
+ List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
+ list.forEach(p -> {
+ //请假类型
+ p.setLeaveTypeName(dicItems.stream()
+ .filter(k -> DicCode.LEAVETYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getLeaveType()))
+ .findFirst()
+ .map(DicItem::getDicItemName)
+ .orElse("事假"));
+ });
+
+ return list;
+ }
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/resources/bootstrap.yml b/febs-server/febs-server-hr/src/main/resources/bootstrap.yml
index 052ea73..621e447 100644
--- a/febs-server/febs-server-hr/src/main/resources/bootstrap.yml
+++ b/febs-server/febs-server-hr/src/main/resources/bootstrap.yml
@@ -6,7 +6,7 @@
config:
server-addr: ${nacos.url}:8848
group: DEFAULT_GROUP
- prefix: febs-server-hr
+ prefix: febs-server-Hr
file-extension: yaml
discovery:
server-addr: ${nacos.url}:8848
--
Gitblit v1.8.0