From 837dd00afec9b64d53d0aec1e6418b27a2937164 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 25 二月 2021 07:59:22 +0800
Subject: [PATCH] fix(员工管理): 更新员工类别与保险类型字典
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 67 ++++++++++++++++++++++++++++++---
1 files changed, 61 insertions(+), 6 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
index 25736f0..2ade707 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
@@ -1,15 +1,22 @@
package cc.mrbird.febs.server.hr.service.impl;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.util.*;
import cc.mrbird.febs.common.core.entity.system.SysConfig;
+import cc.mrbird.febs.common.core.utils.MyUtil;
import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
import cc.mrbird.febs.server.hr.entity.EmpJobChange;
+import cc.mrbird.febs.server.hr.properties.FebsServerHrProperties;
import cc.mrbird.febs.server.hr.service.IEmpDimissionLogService;
import cc.mrbird.febs.server.hr.service.IEmpJobChangeService;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import cc.mrbird.febs.server.hr.entity.*;
+import cn.hutool.core.util.StrUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -35,6 +42,9 @@
import cc.mrbird.febs.server.hr.mapper.EmpBaseInfoMapper;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import lombok.RequiredArgsConstructor;
+import org.springframework.util.FileSystemUtils;
+
+import javax.servlet.http.HttpServletResponse;
/**
* name:EmpBaseinfo
@@ -54,7 +64,7 @@
private final EmpBaseInfoMapper empBaseInfoMapper;
private final IEmpDimissionLogService dimissionLogService;
private final IEmpJobChangeService jobChangeService;
-
+ private final FebsServerHrProperties properties;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
.orElse("1");
@@ -152,7 +162,7 @@
iPage.setRecords(list);
return iPage;
}
-
+
@Override
public IPage<EmpBaseInfo> findZsEmpBaseInfos(QueryRequest request, EmpBaseInfo empBaseInfo) {
LambdaQueryWrapper<EmpBaseInfo> queryWrapper = new LambdaQueryWrapper<>();
@@ -207,9 +217,19 @@
List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
list.forEach(p -> {
p.setSexName("1".equals(p.getSex()) ? "男" : "女");
- p.setEmpTypeName("1".equals(p.getEmpType()) ? "正式工" : "临时工");
- p.setInsuranceTypeName("1".equals(p.getInsuranceType()) ? "（深户）五险一档" : "（非深户）五险一档");
p.setArchivesStatusName("0".equals(p.getArchivesStatus()) ? "未移交" : "已移交");
+ //保险类型
+ p.setInsuranceTypeName(dicItems.stream()
+ .filter(k -> DicCode.INSURANCETYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getInsuranceType()))
+ .findFirst()
+ .map(DicItem::getDicItemName)
+ .orElse("汉族"));
+ //员工类别
+ p.setEmpTypeName(dicItems.stream()
+ .filter(k -> DicCode.EMPTYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getEmpType()))
+ .findFirst()
+ .map(DicItem::getDicItemName)
+ .orElse("汉族"));
// 设置民族
p.setNationName(dicItems.stream()
.filter(k -> DicCode.NATION.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getNation()))
@@ -261,6 +281,12 @@
} else{
empBaseInfo.setEmpId(dbInfo.getEmpId());
}
+ if (StrUtil.isNotBlank(empBaseInfo.getImagePath())){
+ String path = properties.getEmpBaseInfoPath()+empBaseInfo.getEmpId()+".png";
+ if ( MyUtil.generateImage(empBaseInfo.getImagePath(),path)) {
+ empBaseInfo.setImagePath(empBaseInfo.getEmpId()+".png");
+ };
+ }
empBaseInfo.setCreator(operatorId);
empBaseInfo.setModifier(operatorId);
this.saveOrUpdate(empBaseInfo);
@@ -269,6 +295,13 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void updateEmpBaseInfo(EmpBaseInfo empBaseInfo) {
+ if (StrUtil.isNotBlank(empBaseInfo.getImagePath())){
+ String path = properties.getEmpBaseInfoPath()+empBaseInfo.getEmpId()+".png";
+ if ( MyUtil.generateImage(empBaseInfo.getImagePath(),path)) {
+ empBaseInfo.setImagePath(empBaseInfo.getEmpId()+".png");
+ }
+
+ }
EmpBaseInfo dbData = this.getById(empBaseInfo.getEmpId());
empBaseInfo.setCreateTime(dbData.getCreateTime());
empBaseInfo.setCreator(dbData.getCreator());
@@ -333,7 +366,7 @@
if (tempEmpBaseInfo == null) {
return false;
}
- return !empBaseInfo.getEmpId().equals(tempEmpBaseInfo.getEmpId());
+ return !empBaseInfo.getEmpNumb().equals(tempEmpBaseInfo.getEmpNumb());
}
@Override
@@ -485,6 +518,28 @@
this.save(empBaseInfo);
}
}
+
+ @Override
+ public void getImage(String empId, HttpServletResponse response) throws Exception {
+ EmpBaseInfo empBaseInfo = this.getById(empId);
+ if (StrUtil.isBlank(empBaseInfo.getImagePath())){
+ return;
+ }
+ String path = properties.getEmpBaseInfoPath()+empBaseInfo.getEmpId()+".png";
+ try (InputStream inputStream = new FileInputStream(path); OutputStream out = response.getOutputStream()) {
+
+ //byte数组用于存放图片字节数据
+ byte[] buff = new byte[inputStream.available()];
+
+ inputStream.read(buff);
+ inputStream.close();
+
+ //设置发送到客户端的响应内容类型
+ response.setContentType("image/png");
+
+ out.write(buff);
+ }
+ }
@Override
@@ -809,4 +864,4 @@
}
return stringObjectMap;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0