From 860514b61a0edc0bc38b1b2e8d6f59c5a5aeba26 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 23 四月 2021 12:05:39 +0800
Subject: [PATCH] feat(需求增加): 高级查询增加了相关证件查询
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java | 194 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 145 insertions(+), 49 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java
index 156dbcb..dfc02f8 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java
@@ -1,11 +1,14 @@
package cc.mrbird.febs.server.hr.service.impl;
import cc.mrbird.febs.common.core.constant.ModuleCode;
+import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.MyUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;
-import cc.mrbird.febs.server.hr.entity.*;
+import cc.mrbird.febs.server.hr.entity.EmpAccessory;
+import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
+import cc.mrbird.febs.server.hr.entity.Label;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpAccessoryMapper;
import cc.mrbird.febs.server.hr.properties.FebsServerHrProperties;
@@ -13,33 +16,29 @@
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cc.mrbird.febs.server.hr.service.ILabelService;
import cc.mrbird.febs.server.hr.vo.EmpAccessoryVO;
-import cn.hutool.core.date.DateUtil;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.lang.Dict;
import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.ZipUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import org.aspectj.weaver.ast.Or;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.annotation.Propagation;
-import lombok.RequiredArgsConstructor;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import cc.mrbird.febs.common.core.entity.QueryRequest;
-import cc.mrbird.febs.common.core.entity.constant.StringConstant;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.io.IOException;
+import java.io.*;
import java.util.*;
/**
@@ -51,14 +50,13 @@
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
+@Slf4j
public class EmpAccessoryServiceImpl extends ServiceImpl<EmpAccessoryMapper, EmpAccessory> implements IEmpAccessoryService {
private final ILabelService labelService;
private final EmpAccessoryMapper empAccessoryMapper;
private final FebsServerHrProperties properties;
private final IRemoteDeptService remoteDeptService;
- private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
- .map(u -> u.getUserId().toString())
- .orElse("1");
+
private final IEmpBaseInfoService empBaseInfoService;
/**
* 参数2为数据中心ID 参数1为终端ID
@@ -72,7 +70,7 @@
if (StrUtil.isNotBlank(vo.getBasic())) {
queryWrapper.and(p -> {
p.like("a.empNumb", vo.getBasic())
- .or().like("a.deptName", vo.getBasic())
+ .or().like("a.allDeptName", vo.getBasic())
.or().like("a.certificateNumb", vo.getBasic())
.or().like("a.empName", vo.getBasic())
.or().like("a.jobName", vo.getBasic());
@@ -88,20 +86,9 @@
queryWrapper.like("a.certificateNumb", vo.getCertificateNumb());
}
if (StrUtil.isNotBlank(vo.getDeptName())) {
- queryWrapper.like("a.deptName", vo.getDeptName());
+ queryWrapper.like("a.allDeptName", vo.getDeptName());
}
- // if (StrUtil.isNotBlank(vo.getEmpName())) {
- // queryWrapper.like("a.empName", vo.getEmpName().split(","));
- // }
- // if (StrUtil.isNotBlank(vo.getEmpNumb())) {
- // queryWrapper.like("a.empNumb", vo.getEmpNumb().split(","));
- // }
- // if (StrUtil.isNotBlank(vo.getCertificateNumb())) {
- // queryWrapper.like("a.certificateNumb", vo.getCertificateNumb().split(","));
- // }
- // if (StrUtil.isNotBlank(vo.getDeptName())) {
- // queryWrapper.like("a.deptName", vo.getDeptName().split(","));
- // }
+
if (StrUtil.isNotBlank(vo.getEntryDate())) {
queryWrapper.between("a.entryDate", vo.getEntryDate().split(",")[0], vo.getEntryDate().split(",")[1]);
}
@@ -150,12 +137,63 @@
if (StrUtil.isNotBlank(vo.getPolitics())) {
queryWrapper.in("a.politics", vo.getPolitics().split(","));
}
+ if (StringUtils.isNotBlank(vo.getHandbookStatus())) {
+ queryWrapper.in("a.HandbookStatus", vo.getHandbookStatus().split(","));
+ }
+ if (StringUtils.isNotBlank(vo.getEmpCardStatus())) {
+ queryWrapper.in("a.EmpCardStatus", vo.getEmpCardStatus().split(","));
+ }
+ if (StringUtils.isNotBlank(vo.getEmpType())) {
+ queryWrapper.in("a.empType", vo.getEmpType().split(","));
+ }
+ if (StringUtils.isNotBlank(vo.getEntryType())) {
+ queryWrapper.in("a.entryType", vo.getEntryType().split(","));
+ }
+ queryWrapper.inSql("c.dept_Id", remoteDeptService.userRightDepts());
+ if (StrUtil.isNotBlank(vo.getFileName())){
+ queryWrapper.like("acc.filesName", vo.getFileName());
+ }
+ if (StrUtil.equals(vo.getField(),"empName")){
+ if (StrUtil.equals(vo.getOrder(),"descending")){
+ queryWrapper.orderByDesc("a.empName");
+ }else{
+ queryWrapper.orderByAsc("a.empName");
+ }
+ }else if(StrUtil.equals(vo.getField(),"empNumb")){
+ if (StrUtil.equals(vo.getOrder(),"descending")){
+ queryWrapper.orderByDesc("a.empNumb");
+ }else{
+ queryWrapper.orderByAsc("a.empNumb");
+ }
+ }else if(StrUtil.equals(vo.getField(),"deptName")){
+ if (StrUtil.equals(vo.getOrder(),"descending")){
+ queryWrapper.orderByDesc("deptName");
+ }else{
+ queryWrapper.orderByAsc("deptName");
+ }
+ }else if(StrUtil.equals(vo.getField(),"jobName")){
+ if (StrUtil.equals(vo.getOrder(),"descending")){
+ queryWrapper.orderByDesc("a.jobName");
+ }else{
+ queryWrapper.orderByAsc("a.jobName");
+ }
+ }else if(StrUtil.equals(vo.getField(),"certificateNumb")){
+ if (StrUtil.equals(vo.getOrder(),"descending")){
+ queryWrapper.orderByDesc("a.certificateNumb");
+ }else{
+ queryWrapper.orderByAsc("a.certificateNumb");
+ }
+ }
- queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
- queryWrapper.orderByAsc("a.deptName,a.empName,a.certificateNumb");
+ queryWrapper.groupBy(" a.delFlag,a.empName,a.empStatus,a.empId,a.certificateNumb,a.empNumb,deptName,a.jobName");
Page<EmpAccessory> page = new Page<>(request.getPageNum(), request.getPageSize());
- String querySql = empAccessoryMapper.getQuerySql();
- IPage<Map<String, Object>> mapIPage = empAccessoryMapper.selectPageVo(page, queryWrapper, querySql);
+ // String querySql = empAccessoryMapper.getQuerySql();
+ //List<Label> labelList = labelService.findLabels(new Label());
+ IPage<Map<String, Object>> mapIPage = empAccessoryMapper.selectPageVo(page, queryWrapper);
+ mapIPage.getRecords().parallelStream().forEach(i->{
+ List<Map<String, Object>> mapList = this.baseMapper.getEmpAccessoryNumber((Long) i.get("empId"));
+ mapList.parallelStream().forEach(j->i.put(j.get("labelCode").toString(),Integer.parseInt(j.get("number").toString())));
+ });
return mapIPage;
}
@@ -180,18 +218,18 @@
public void createEmpAccessory(Long labelid, MultipartFile file, Long empId) throws FebsException, IOException {
EmpBaseInfo empBaseInfo = empBaseInfoService.getById(empId);
String nameAndCertificateNumb = empBaseInfo.getEmpName() + "_" + empBaseInfo.getCertificateNumb() + "/";
- Dict dict = MyUtil.filesUpload(file, properties.getUploadSinglePath() + nameAndCertificateNumb, snowflake.nextIdStr());
+ Dict dict = MyUtil.filesUpload(file, properties.getUploadSinglePath() + nameAndCertificateNumb);
EmpAccessory accessory = new EmpAccessory();
accessory.setCreatetime(new Date());
- accessory.setCreator(operatorId);
+ accessory.setCreator(FebsUtil.getUserId());
accessory.setDelFlag(0);
accessory.setEmpid(empId);
- accessory.setFilesaddress(dict.getStr("newName"));
+ accessory.setFilesaddress(dict.getStr("fileName"));
accessory.setFilesformat(StrUtil.isBlank(dict.getStr("suffix")) ? dict.getStr("suffix") : dict.getStr("suffix").substring(1));
accessory.setAccessoryid(SequenceUtil.generateId(0L, ModuleCode.HR_FIlE));
accessory.setFilesname(dict.getStr("fileName"));
accessory.setLabelid(labelid);
- accessory.setModifier(operatorId);
+ accessory.setModifier(FebsUtil.getUserId());
accessory.setModifytime(new Date());
accessory.setVersion(0);
this.save(accessory);
@@ -199,8 +237,27 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void updateEmpAccessory(EmpAccessory empAccessory) {
- this.saveOrUpdate(empAccessory);
+ public void updateEmpAccessory(EmpAccessory empAccessory) throws FebsException {
+ if ( empAccessory.getFilesname().lastIndexOf(".")<=0){
+ throw new FebsException("文件名格式错误");
+ }
+
+ EmpAccessory accessory = this.getById(empAccessory.getAccessoryid());
+
+ EmpBaseInfo empBaseInfo = empBaseInfoService.getById(accessory.getEmpid());
+ String nameAndCertificateNumb = empBaseInfo.getEmpName() + "_" + empBaseInfo.getCertificateNumb() + "/";
+ if (FileUtil.exist(properties.getUploadSinglePath() + nameAndCertificateNumb+empAccessory.getFilesname())){
+ throw new FebsException("文件已经存在");
+ }
+
+ File file = new File(properties.getUploadSinglePath() + nameAndCertificateNumb+accessory.getFilesaddress());
+ FileUtil.rename(file,empAccessory.getFilesname(),true);
+ LambdaUpdateWrapper<EmpAccessory> wrapper = new LambdaUpdateWrapper<>();
+ wrapper.eq(EmpAccessory::getAccessoryid,empAccessory.getAccessoryid())
+ .set(EmpAccessory::getFilesname,empAccessory.getFilesname())
+ .set(EmpAccessory::getFilesaddress,empAccessory.getFilesname())
+ .set(EmpAccessory::getFilesformat, empAccessory.getFilesname().substring( empAccessory.getFilesname().lastIndexOf(".")+1));
+ this.update(wrapper);
}
@Override
@@ -210,7 +267,7 @@
LambdaUpdateWrapper<EmpAccessory> wapper = new LambdaUpdateWrapper<>();
wapper.in(EmpAccessory::getAccessoryid, arr);
wapper.set(EmpAccessory::getDelFlag, 1);
- wapper.set(EmpAccessory::getModifier, operatorId);
+ wapper.set(EmpAccessory::getModifier, FebsUtil.getUserId());
wapper.set(EmpAccessory::getModifytime, new Date());
this.update(wapper);
@@ -238,7 +295,7 @@
if (fileName.parallelStream().filter(filter -> StrUtil.equals(accessory.getFilesname(), filter)).count() == 0) {
fileName.add(accessory.getFilesname());
} else {
- fileName.add(accessory.getFilesname() + fileName.parallelStream().filter(filter -> StrUtil.equals(accessory.getFilesname(), filter)).count() + 1);
+ fileName.add(accessory.getFilesname().substring(0,accessory.getFilesname().lastIndexOf(".")) + fileName.parallelStream().filter(filter -> StrUtil.equals(accessory.getFilesname(), filter)).count()+"."+accessory.getFilesformat());
}
});
MyUtil.download(request, response, files, fileName);
@@ -250,7 +307,7 @@
String[] arr = accessoryids.split(",");
LambdaUpdateWrapper<EmpAccessory> wapper = new LambdaUpdateWrapper<>();
wapper.in(EmpAccessory::getAccessoryid, arr);
- wapper.set(EmpAccessory::getModifier, operatorId);
+ wapper.set(EmpAccessory::getModifier, FebsUtil.getUserId());
wapper.set(EmpAccessory::getModifytime, new Date());
wapper.set(EmpAccessory::getLabelid, labelid);
this.update(wapper);
@@ -304,16 +361,23 @@
public void autoInstall(String fileids) {
File[] list = FileUtil.ls(fileids);
for (File file : list) {
-
String[] fileName = file.getName().split("_");
+ if (fileName.length<2){
+ log.error(file.getName());
+ continue;
+ }
List<EmpBaseInfo> empBaseInfo = empBaseInfoService.list(new LambdaQueryWrapper<EmpBaseInfo>().eq(EmpBaseInfo::getCertificateNumb, fileName[1]).ne(EmpBaseInfo::getDelFlag, 1));
- if (0 == empBaseInfo.size()) {
+ if (null == empBaseInfo ||0 == empBaseInfo.size()) {
continue;
}
File[] childlist = FileUtil.ls(fileids+"/"+file.getName());
for (File file1 : childlist) {
EmpAccessory accessory = new EmpAccessory();
- if (file1.getName().indexOf("体检")>=0){
+ if (file1.getName().indexOf("外皮")>=0||file1.getName().indexOf("外批")>=0){
+ accessory.setLabelid(142445285230593L);
+ }else if (file1.getName().indexOf("心电图")>=0){
+ accessory.setLabelid(142445218121729L);
+ }else if (file1.getName().indexOf("体检")>=0){
accessory.setLabelid(142445218121729L);
}else if (file1.getName().indexOf("合同")>=0){
accessory.setLabelid(142445285230593L);
@@ -323,10 +387,12 @@
accessory.setLabelid(143007818991617L);
}else if (file1.getName().indexOf("银行卡")>=0){
accessory.setLabelid(143073768130561L);
+ }else if (file1.getName().indexOf("回执")>=0){
+ accessory.setLabelid(143073617135617L);
}else if (file1.getName().indexOf("证")>=0){
accessory.setLabelid(143073812170753L);
}else{
- accessory.setLabelid(142445180372993L);
+ accessory.setLabelid(143073866696705L);
}
accessory.setCreatetime(new Date());
@@ -334,8 +400,8 @@
accessory.setDelFlag(0);
accessory.setEmpid(empBaseInfo.get(0).getEmpId());
accessory.setFilesaddress(file1.getName());
- if (file1.getName().indexOf(".") > 0) {
- accessory.setFilesformat( file1.getName().substring(file1.getName().indexOf(".")+1));
+ if (file1.getName().lastIndexOf(".") > 0) {
+ accessory.setFilesformat( file1.getName().substring(file1.getName().lastIndexOf(".")+1));
}
accessory.setAccessoryid(SequenceUtil.generateId(0L, ModuleCode.HR_FIlE));
accessory.setFilesname(file1.getName());
@@ -347,4 +413,34 @@
}
}
+
+ @Override
+ public void getImage(String accessoryid, HttpServletResponse response) throws Exception {
+ EmpAccessory empAccessory = this.getById(accessoryid);
+ if (StrUtil.isBlank(empAccessory.getFilesaddress())) {
+ return;
+ }
+ EmpBaseInfo empBaseInfo = empBaseInfoService.getById(empAccessory.getEmpid());
+ String nameAndCertificateNumb = empBaseInfo.getEmpName() + "_" + empBaseInfo.getCertificateNumb() + "/";
+ String path = properties.getUploadSinglePath() + nameAndCertificateNumb + empAccessory.getFilesaddress();
+ try (InputStream inputStream = new FileInputStream(path); OutputStream out = response.getOutputStream()) {
+ //byte数组用于存放图片字节数据
+ byte[] buff = new byte[inputStream.available()];
+ inputStream.read(buff);
+ inputStream.close();
+ if (empAccessory.getFilesformat().equals("tif")){
+ //设置发送到客户端的响应内容类型
+ response.setContentType("image/tiff");
+ }else if (empAccessory.getFilesformat().equals("bmp")){
+ response.setContentType("application/x-bmp");
+ }else if (empAccessory.getFilesformat().equals("jpg")){
+ response.setContentType("image/jpeg");
+ }else if (empAccessory.getFilesformat().equals("png")){
+ response.setContentType("image/png");
+ }else if (empAccessory.getFilesformat().equals("gif")){
+ response.setContentType("image/gif");
+ }
+ out.write(buff);
+ }
+ }
}
--
Gitblit v1.8.0