From da7fc9b3e00ceed3186662a3662e296f1e581f9c Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期五, 26 二月 2021 02:22:32 +0800
Subject: [PATCH] 修改bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 143 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 115 insertions(+), 28 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 291d4d1..b12da11 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,23 @@
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 java.util.function.Consumer;
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 +43,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 +65,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");
@@ -89,6 +100,9 @@
}
if (StringUtils.isNotBlank(empBaseInfo.getPolitics())) {
queryWrapper.like(EmpBaseInfo::getPolitics, empBaseInfo.getPolitics());
+ }
+ if (StringUtils.isNotBlank(empBaseInfo.getEmpStatus())) {
+ queryWrapper.in(EmpBaseInfo::getEmpStatus, empBaseInfo.getEmpStatus());
}
if (StringUtils.isNotBlank(empBaseInfo.getAgeStr())) {
queryWrapper.between(EmpBaseInfo::getAge, empBaseInfo.getAgeStr().split(",")[0], empBaseInfo.getAgeStr().split(",")[1]);
@@ -152,7 +166,7 @@
iPage.setRecords(list);
return iPage;
}
-
+
@Override
public IPage<EmpBaseInfo> findZsEmpBaseInfos(QueryRequest request, EmpBaseInfo empBaseInfo) {
LambdaQueryWrapper<EmpBaseInfo> queryWrapper = new LambdaQueryWrapper<>();
@@ -184,13 +198,19 @@
if (StringUtils.isNotBlank(empBaseInfo.getPolitics())) {
queryWrapper.in(EmpBaseInfo::getPolitics, empBaseInfo.getPolitics().split(","));
}
- if (StringUtils.isNotBlank(empBaseInfo.getAgeStr())) {
- String[] ages=empBaseInfo.getAgeStr().split(",");
- for (int i = 0; i < ages.length; i++) {
- String ageBtn=ages[i];
- queryWrapper.between(EmpBaseInfo::getAge, ageBtn.split("-")[0], ageBtn.split("-")[1]);
- }
- }
+ if (StringUtils.isNotBlank(empBaseInfo.getAgeStr())) {
+ String[] ages = empBaseInfo.getAgeStr().split(",");
+ Consumer<LambdaQueryWrapper<EmpBaseInfo>> consumer = new Consumer<LambdaQueryWrapper<EmpBaseInfo>>() {
+ @Override
+ public void accept(LambdaQueryWrapper<EmpBaseInfo> wrapper) {
+ for (int i = 0; i < ages.length; i++) {
+ String ageBtn = ages[i];
+ wrapper.or().between(EmpBaseInfo::getAge, ageBtn.split("-")[0], ageBtn.split("-")[1]);
+ }
+ }
+ };
+ queryWrapper.and(consumer);
+ }
if (StringUtils.isNotBlank(empBaseInfo.getArchivesStatus())) {
queryWrapper.in(EmpBaseInfo::getArchivesStatus, empBaseInfo.getArchivesStatus().split(","));
}
@@ -207,9 +227,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 +291,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 +305,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 +376,7 @@
if (tempEmpBaseInfo == null) {
return false;
}
- return !empBaseInfo.getEmpId().equals(tempEmpBaseInfo.getEmpId());
+ return !empBaseInfo.getEmpNumb().equals(tempEmpBaseInfo.getEmpNumb());
}
@Override
@@ -440,29 +483,73 @@
for (List<Object> list : listObject) {
EmpBaseInfo empBaseInfo = new EmpBaseInfo();
empBaseInfo.setEmpId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
- empBaseInfo.setEmpNumb(list.get(0).toString());
+ empBaseInfo.setArchivesNumb(list.get(0).toString());
+ empBaseInfo.setEmpNumb(list.get(1).toString());
+ empBaseInfo.setEmpName(list.get(2).toString());
List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
- empBaseInfo.setDeptName(list.get(1).toString());
- Long deptId=depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().get().getDeptId();
+ empBaseInfo.setDeptName(list.get(3).toString());
+ Long deptId = depts.stream().filter(d -> d.getDeptName().equals(list.get(3).toString())).findFirst().get()
+ .getDeptId();
empBaseInfo.setDeptId(deptId);
- empBaseInfo.setJobName(list.get(2).toString());
- empBaseInfo.setEmpName(list.get(3).toString());
- empBaseInfo.setCertificateNumb(list.get(4).toString());
- empBaseInfo.setSex("男".equals(list.get(5).toString())?"1":"0");
- if (StringUtils.isNotBlank(list.get(6).toString())) {
- empBaseInfo.setAge(Integer.valueOf(list.get(6).toString()));
- }
- empBaseInfo.setEducation(list.get(7).toString());
- empBaseInfo.setNativePlace(list.get(8).toString());
- empBaseInfo.setTelePhone(list.get(9).toString());
+ empBaseInfo.setJobName(list.get(4).toString());
+ empBaseInfo.setEmpType(list.get(5).toString());
+ empBaseInfo.setSex("男".equals(list.get(6).toString()) ? "1" : "2");
+ empBaseInfo.setNation(list.get(7).toString());
+ empBaseInfo.setCertificateNumb(list.get(8).toString());
+ empBaseInfo.setMarriage(list.get(9).toString());
if (StringUtils.isNotBlank(list.get(10).toString())) {
- empBaseInfo.setEntryDate(DateUtil.parseDate(list.get(10).toString()));
+ empBaseInfo.setStature(Integer.valueOf(list.get(10).toString()));
}
+ empBaseInfo.setPolitics(list.get(11).toString());
+ if (StringUtils.isNotBlank(list.get(12).toString())) {
+ empBaseInfo.setEntryDate(DateUtil.parseDate(list.get(12).toString()));
+ }
+ empBaseInfo.setEducation(list.get(13).toString());
+ if (StringUtils.isNotBlank(list.get(14).toString())) {
+ empBaseInfo.setSeniority(Integer.valueOf(list.get(14).toString()));
+ }
+ empBaseInfo.setNativePlace(list.get(15).toString());
+ empBaseInfo.setCensusAddress(list.get(16).toString());
+ empBaseInfo.setCurrentAddress(list.get(17).toString());
+ empBaseInfo.setGuardNumb(list.get(18).toString());
+ empBaseInfo.setReturnReceipt(list.get(19).toString());
+ empBaseInfo.setTelePhone(list.get(20).toString());
+ empBaseInfo.setIntroducer(list.get(21).toString());
+ empBaseInfo.setBankName(list.get(22).toString());
+ empBaseInfo.setBankNumb(list.get(23).toString());
+ empBaseInfo.setInsuranceType(list.get(24).toString());
+ empBaseInfo.setSocialNumb(list.get(25).toString());
+ empBaseInfo.setFamily(list.get(26).toString());
+ empBaseInfo.setUrgencyPhone(list.get(27).toString());
+ empBaseInfo.setHandbookStatus(list.get(28).toString());
+ empBaseInfo.setEmpCardStatus(list.get(29).toString());
+ empBaseInfo.setCertificateList(list.get(30).toString());
empBaseInfo.setEmpStatus("0");
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
@@ -787,4 +874,4 @@
}
return stringObjectMap;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0