From ecad6bdfc3a547d8aa4ae80aec4f060c10e442e0 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期五, 26 二月 2021 17:05:31 +0800
Subject: [PATCH] 修改bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 270 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 242 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 669faf1..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,14 +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;
@@ -34,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
@@ -53,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");
@@ -88,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]);
@@ -153,6 +168,114 @@
}
@Override
+ public IPage<EmpBaseInfo> findZsEmpBaseInfos(QueryRequest request, EmpBaseInfo empBaseInfo) {
+ LambdaQueryWrapper<EmpBaseInfo> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EmpBaseInfo::getDelFlag, empBaseInfo.getDelFlag());
+ if (StringUtils.isNotBlank(empBaseInfo.getEmpNumb())) {
+ queryWrapper.like(EmpBaseInfo::getEmpNumb, empBaseInfo.getEmpNumb());
+ }
+ if (StringUtils.isNotBlank(empBaseInfo.getEmpName())) {
+ queryWrapper.like(EmpBaseInfo::getEmpName, empBaseInfo.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empBaseInfo.getCertificateNumb())) {
+ queryWrapper.like(EmpBaseInfo::getCertificateNumb, empBaseInfo.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empBaseInfo.getDeptName())) {
+ queryWrapper.like(EmpBaseInfo::getDeptName, empBaseInfo.getDeptName());
+ }
+ if (StringUtils.isNotBlank(empBaseInfo.getEntryDateStr())) {
+ queryWrapper.between(EmpBaseInfo::getEntryDate, empBaseInfo.getEntryDateStr().split(",")[0], empBaseInfo.getEntryDateStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empBaseInfo.getDimissionDateStr())) {
+ queryWrapper.between(EmpBaseInfo::getDimissionDate, empBaseInfo.getDimissionDateStr().split(",")[0], empBaseInfo.getDimissionDateStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empBaseInfo.getSex())) {
+ queryWrapper.in(EmpBaseInfo::getSex, empBaseInfo.getSex().split(","));
+ }
+ if (StringUtils.isNotBlank(empBaseInfo.getEducation())) {
+ queryWrapper.in(EmpBaseInfo::getEducation, empBaseInfo.getEducation().split(","));
+ }
+ if (StringUtils.isNotBlank(empBaseInfo.getPolitics())) {
+ queryWrapper.in(EmpBaseInfo::getPolitics, empBaseInfo.getPolitics().split(","));
+ }
+ 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(","));
+ }
+ if (StringUtils.isNotBlank(empBaseInfo.getInsuranceType())) {
+ queryWrapper.in(EmpBaseInfo::getInsuranceType, empBaseInfo.getInsuranceType().split(","));
+ }
+ if (StringUtils.isNotBlank(empBaseInfo.getEmpStatus())) {
+ queryWrapper.in(EmpBaseInfo::getEmpStatus, empBaseInfo.getEmpStatus().split(","));
+ }
+ Page<EmpBaseInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<EmpBaseInfo> iPage = this.page(page, queryWrapper);
+ //设置部门
+ List<EmpBaseInfo> list = setDeptName(iPage.getRecords());
+ List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
+ list.forEach(p -> {
+ p.setSexName("1".equals(p.getSex()) ? "男" : "女");
+ 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()))
+ .findFirst()
+ .map(DicItem::getDicItemName)
+ .orElse("汉族"));
+ // 设置政治面貌
+ p.setPoliticsName(dicItems.stream()
+ .filter(k -> DicCode.PLITICAL.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getPolitics()))
+ .findFirst()
+ .map(DicItem::getDicItemName)
+ .orElse("群众"));
+ // 设置婚姻状况
+ p.setMarriageName(dicItems.stream()
+ .filter(k -> DicCode.MARRIAGE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getMarriage()))
+ .findFirst()
+ .map(DicItem::getDicItemName)
+ .orElse("未婚"));
+ // 设置学历
+ p.setEducationName(dicItems.stream()
+ .filter(k -> DicCode.EDUCATION.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getEducation()))
+ .findFirst()
+ .map(DicItem::getDicItemName)
+ .orElse("无学历"));
+ // 设置籍贯
+ p.setNativePlaceName(dicItems.stream()
+ .filter(k -> DicCode.NATIVEPLACE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getNativePlace()))
+ .findFirst()
+ .map(DicItem::getDicItemName)
+ .orElse("未知"));
+ });
+ iPage.setRecords(list);
+ return iPage;
+ }
+
+ @Override
public List<EmpBaseInfo> findEmpBaseInfos(EmpBaseInfo empBaseInfo) {
LambdaQueryWrapper<EmpBaseInfo> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(EmpBaseInfo::getDelFlag, empBaseInfo.getDelFlag());
@@ -168,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);
@@ -176,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());
@@ -240,7 +376,7 @@
if (tempEmpBaseInfo == null) {
return false;
}
- return !empBaseInfo.getEmpId().equals(tempEmpBaseInfo.getEmpId());
+ return !empBaseInfo.getEmpNumb().equals(tempEmpBaseInfo.getEmpNumb());
}
@Override
@@ -347,35 +483,86 @@
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
public IPage<EmpBaseInfo> baseInfoList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name) {
Page<EmpBaseInfo> page = new Page<EmpBaseInfo>(new Long(pageNum), new Long(pageSize));
IPage<EmpBaseInfo> iPage =null;
+ List<SysConfig> sysConfig=this.baseMapper.sysConfig();
+ String manOld="";
+ String womanOld="";
+ if(sysConfig.size()>0){
+ manOld=sysConfig.get(0).getConfigValue();
+ womanOld=sysConfig.get(1).getConfigValue();
+ }
if("1".equals(number)){ //在职员工
iPage = this.empBaseInfoMapper.zzbaseInfoList(page, index,btime,etime,name);
}else if("2".equals(number)){ //新进员工
@@ -385,7 +572,7 @@
}else if("4".equals(number)){ //临时员工
iPage = this.empBaseInfoMapper.lsbaseInfoList(page, index,btime,etime,name);
}else if("5".equals(number)){ //超龄员工
- iPage = this.empBaseInfoMapper.baseInfoList(page, index,btime,etime,name);
+ iPage = this.empBaseInfoMapper.clbaseInfoList(page, index,btime,etime,name,manOld,womanOld);
}else if("6".equals(number)){ //离职员工总数
iPage = this.empBaseInfoMapper.lzbaseInfoList(page, index,btime,etime,name);
}else if("7".equals(number)){ //辞职申请人数
@@ -519,8 +706,12 @@
}
@Override
- public IPage<?> empBaseInfoTgList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name) {
- return null;
+ public IPage<EmpJobChange> empBaseInfoTgList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name) {
+ Page<EmpJobChange> page = new Page<EmpJobChange>(new Long(pageNum), new Long(pageSize));
+ IPage<EmpJobChange> iPage =null;
+ //调岗
+ iPage = this.empBaseInfoMapper.empBaseInfoTgList(page, index,btime,etime,name,number);
+ return iPage;
}
@Override
@@ -570,17 +761,36 @@
@Override
public Map<String, Object> countBaseInfoList(String index, String btime, String etime) {
- //在职员工,正式员工，临时员工，正常离职，自动离职，公司辞退 判断条件离职申请日期
- Map<String, Object> stringObjectMap = this.baseMapper.countBaseInfoList(index,btime,etime);
+ List<SysConfig> sysConfig=this.baseMapper.sysConfig();
+ String manOld="";
+ String womanOld="";
+ if(sysConfig.size()>0){
+ manOld=sysConfig.get(0).getConfigValue();
+ womanOld=sysConfig.get(1).getConfigValue();
+ }
+ //在职员工,正式员工，临时员工，超龄员工
+ Map<String, Object> stringObjectMap = this.baseMapper.countBaseInfoList(index,btime,etime,manOld,womanOld);
+ //正常离职，自动离职，公司辞退 判断条件创建日期
+ Map<String, Object> zclzObjectMap =this.baseMapper.countZcygBaseInfoList(index,btime,etime);
+ if(zclzObjectMap!=null){
+ stringObjectMap.put("zclz",zclzObjectMap.get("zclz").toString());
+ stringObjectMap.put("zdlz",zclzObjectMap.get("zdlz").toString());
+ stringObjectMap.put("gsct",zclzObjectMap.get("gsct").toString());
+ }
//新进员工 判断条件入职日期
Integer xjygObjectMap =this.baseMapper.countXjygBaseInfoList(index,btime,etime);
if(xjygObjectMap!=null){
stringObjectMap.put("xjyg",xjygObjectMap);
}
- //离职员工总数,解除合同 判断条件离职申请日期
+
+ //离职员工总数
+ Integer empStatus = this.baseMapper.selectCount(new QueryWrapper<EmpBaseInfo>().eq("empStatus", 1));
+ if(empStatus!=null){
+ stringObjectMap.put("lzyg",empStatus);
+ }
+ //解除合同 判断条件离职申请日期
Map<String, Object> lzygObjectMap =this.baseMapper.countLzygBaseInfoList(index,btime,etime);
if(lzygObjectMap!=null){
- stringObjectMap.put("lzyg",lzygObjectMap.get("lzyg").toString());
stringObjectMap.put("jcht",lzygObjectMap.get("jcht").toString());
}
//辞职申请员工总数 判断条件辞职申请日期
@@ -588,12 +798,16 @@
if(czygObjectMap!=null){
stringObjectMap.put("czyg",czygObjectMap);
}
- //有效合同，新签合同，续签合同 判断条件合同签订日期
+ //有效合同 判断条件合同签订日期
Map<String, Object> yxhtObjectMap =this.baseMapper.countYxhtBaseInfoList(index,btime,etime);
if(yxhtObjectMap!=null){
stringObjectMap.put("yxht",yxhtObjectMap.get("yxht").toString());
- stringObjectMap.put("xinqht",yxhtObjectMap.get("xinqht").toString());
- stringObjectMap.put("xqht",yxhtObjectMap.get("xqht").toString());
+ }
+ //新签合同，续签合同 判断条件合同签订日期
+ Map<String, Object> xqhtObjectMap =this.baseMapper.countXqhtBaseInfoList(index,btime,etime);
+ if(yxhtObjectMap!=null){
+ stringObjectMap.put("xinqht",xqhtObjectMap.get("xinqht").toString());
+ stringObjectMap.put("xqht",xqhtObjectMap.get("xqht").toString());
}
//到期合同 判断条件合同结束时间
Integer dqhtObjectMap =this.baseMapper.countDqhtBaseInfoList(index,btime,etime);
@@ -660,4 +874,4 @@
}
return stringObjectMap;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0