From 17e79b16f252d46deffb9e0223a45cb14f930448 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期二, 09 三月 2021 21:47:17 +0800
Subject: [PATCH] xx
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java | 156 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 114 insertions(+), 42 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 ab72325..156dbcb 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
@@ -6,6 +6,7 @@
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.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpAccessoryMapper;
import cc.mrbird.febs.server.hr.properties.FebsServerHrProperties;
import cc.mrbird.febs.server.hr.service.IEmpAccessoryService;
@@ -31,6 +32,8 @@
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 org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
@@ -52,6 +55,7 @@
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");
@@ -63,22 +67,41 @@
@Override
public IPage<Map<String, Object>> findEmpAccessorys(QueryRequest request, EmpAccessoryVO vo) {
- QueryWrapper<EmpAccessoryVO> queryWrapper = new QueryWrapper<>();
+ QueryWrapper<EmpAccessoryVO> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("a.delFlag", 0);
if (StrUtil.isNotBlank(vo.getBasic())) {
- queryWrapper.like("a.empNumb", vo.getBasic()).or().like("a.deptName", vo.getBasic()).or().like("a.certificateNumb", vo.getBasic()).or().like("a.certificateNumb", vo.getBasic()).or().like("a.jobName", vo.getBasic());
+ queryWrapper.and(p -> {
+ p.like("a.empNumb", vo.getBasic())
+ .or().like("a.deptName", vo.getBasic())
+ .or().like("a.certificateNumb", vo.getBasic())
+ .or().like("a.empName", vo.getBasic())
+ .or().like("a.jobName", vo.getBasic());
+ });
}
if (StrUtil.isNotBlank(vo.getEmpName())) {
- queryWrapper.like("a.empName", vo.getEmpName().split(","));
+ queryWrapper.like("a.empName", vo.getEmpName());
}
if (StrUtil.isNotBlank(vo.getEmpNumb())) {
- queryWrapper.like("a.empNumb", vo.getEmpNumb().split(","));
+ queryWrapper.like("a.empNumb", vo.getEmpNumb());
}
if (StrUtil.isNotBlank(vo.getCertificateNumb())) {
- queryWrapper.like("a.certificateNumb", vo.getCertificateNumb().split(","));
+ queryWrapper.like("a.certificateNumb", vo.getCertificateNumb());
}
if (StrUtil.isNotBlank(vo.getDeptName())) {
- queryWrapper.like("a.deptName", vo.getDeptName().split(","));
+ queryWrapper.like("a.deptName", 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]);
}
@@ -107,19 +130,19 @@
}
if (StrUtil.isNotBlank(vo.getArchivesStatus())) {
- queryWrapper.in("a.archivesStatus", vo.getArchivesStatus().split(","));
+ queryWrapper.in("a.archivesStatus", vo.getArchivesStatus().split(","));
}
if (StrUtil.isNotBlank(vo.getEducation())) {
- queryWrapper.in("a.education", vo.getEducation().split(","));
+ queryWrapper.in("a.education", vo.getEducation().split(","));
}
if (StrUtil.isNotBlank(vo.getSex())) {
- queryWrapper.in("a.sex", vo.getSex().split(","));
+ queryWrapper.in("a.sex", vo.getSex().split(","));
}
if (StrUtil.isNotBlank(vo.getInsuranceType())) {
- queryWrapper.in("a.insuranceType", vo.getInsuranceType().split(","));
+ queryWrapper.in("a.insuranceType", vo.getInsuranceType().split(","));
}
if (StrUtil.isNotBlank(vo.getPolitics())) {
- queryWrapper.in("a.politics", vo.getPolitics().split(","));
+ queryWrapper.in("a.politics", vo.getPolitics().split(","));
}
if (StrUtil.isNotBlank(vo.getEmpStatus())) {
queryWrapper.in("a.empStatus", vo.getEmpStatus().split(","));
@@ -127,7 +150,8 @@
if (StrUtil.isNotBlank(vo.getPolitics())) {
queryWrapper.in("a.politics", vo.getPolitics().split(","));
}
- queryWrapper.eq("a.delFlag", 0);
+
+ queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
queryWrapper.orderByAsc("a.deptName,a.empName,a.certificateNumb");
Page<EmpAccessory> page = new Page<>(request.getPageNum(), request.getPageSize());
String querySql = empAccessoryMapper.getQuerySql();
@@ -184,19 +208,19 @@
public void deleteEmpAccessory(String accessoryids) {
String[] arr = accessoryids.split(",");
LambdaUpdateWrapper<EmpAccessory> wapper = new LambdaUpdateWrapper<>();
- wapper.in(EmpAccessory::getAccessoryid,arr);
- wapper.set(EmpAccessory::getDelFlag,1);
- wapper.set(EmpAccessory::getModifier,operatorId);
- wapper.set(EmpAccessory::getModifytime,new Date());
+ wapper.in(EmpAccessory::getAccessoryid, arr);
+ wapper.set(EmpAccessory::getDelFlag, 1);
+ wapper.set(EmpAccessory::getModifier, operatorId);
+ wapper.set(EmpAccessory::getModifytime, new Date());
this.update(wapper);
LambdaQueryWrapper<EmpAccessory> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.in(EmpAccessory::getAccessoryid,arr);
+ queryWrapper.in(EmpAccessory::getAccessoryid, arr);
List<EmpAccessory> list = this.list(queryWrapper);
- list.parallelStream().forEach(i-> {
+ list.parallelStream().forEach(i -> {
EmpBaseInfo empBaseInfo = empBaseInfoService.getById(i.getEmpid());
- String nameAndCertificateNumb = empBaseInfo.getEmpName()+"_"+empBaseInfo.getCertificateNumb()+"/";
- FileUtil.del(properties.getUploadSinglePath()+nameAndCertificateNumb+"/" + i.getFilesaddress());
+ String nameAndCertificateNumb = empBaseInfo.getEmpName() + "_" + empBaseInfo.getCertificateNumb() + "/";
+ FileUtil.del(properties.getUploadSinglePath() + nameAndCertificateNumb + "/" + i.getFilesaddress());
});
}
@@ -209,12 +233,12 @@
Arrays.stream(arr).forEach(i -> {
EmpAccessory accessory = this.getById(i);
EmpBaseInfo empBaseInfo = empBaseInfoService.getById(accessory.getEmpid());
- String nameAndCertificateNumb = empBaseInfo.getEmpName()+"_"+empBaseInfo.getCertificateNumb()+"/";
+ String nameAndCertificateNumb = empBaseInfo.getEmpName() + "_" + empBaseInfo.getCertificateNumb() + "/";
files.add(new File(properties.getUploadSinglePath() + nameAndCertificateNumb + accessory.getFilesaddress()));
- if ( fileName.parallelStream().filter(filter->StrUtil.equals(accessory.getFilesname(),filter)).count()==0){
+ 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);
+ } else {
+ fileName.add(accessory.getFilesname() + fileName.parallelStream().filter(filter -> StrUtil.equals(accessory.getFilesname(), filter)).count() + 1);
}
});
MyUtil.download(request, response, files, fileName);
@@ -222,13 +246,13 @@
}
@Override
- public void mvFiles(String accessoryids,Long labelid,Long empId) {
+ public void mvFiles(String accessoryids, Long labelid, Long empId) {
String[] arr = accessoryids.split(",");
LambdaUpdateWrapper<EmpAccessory> wapper = new LambdaUpdateWrapper<>();
wapper.in(EmpAccessory::getAccessoryid, arr);
- wapper.set(EmpAccessory::getModifier,operatorId);
- wapper.set(EmpAccessory::getModifytime,new Date());
- wapper.set(EmpAccessory::getLabelid,labelid);
+ wapper.set(EmpAccessory::getModifier, operatorId);
+ wapper.set(EmpAccessory::getModifytime, new Date());
+ wapper.set(EmpAccessory::getLabelid, labelid);
this.update(wapper);
}
@@ -237,31 +261,31 @@
public void singledownload(String empIds, Long labelid, HttpServletRequest request, HttpServletResponse response) throws IOException {
String[] arr = empIds.split(",");
//主文件夹
- String mianFileStr = properties.getUploadSinglePath()+snowflake.nextIdStr()+"/";
+ String mianFileStr = properties.getUploadSinglePath() + snowflake.nextIdStr() + "/";
FileUtil.mkdir(mianFileStr);
Arrays.stream(arr).forEach(i -> {
LambdaQueryWrapper<EmpAccessory> lambdaQueryWrapper = new LambdaQueryWrapper<>();
- lambdaQueryWrapper.eq(EmpAccessory::getEmpid,i);
- lambdaQueryWrapper.eq(EmpAccessory::getDelFlag,0);
- if (!labelid.equals(-1L)){
- lambdaQueryWrapper.eq(EmpAccessory::getLabelid,labelid);
+ lambdaQueryWrapper.eq(EmpAccessory::getEmpid, i);
+ lambdaQueryWrapper.eq(EmpAccessory::getDelFlag, 0);
+ if (!labelid.equals(-1L)) {
+ lambdaQueryWrapper.eq(EmpAccessory::getLabelid, labelid);
}
List<EmpAccessory> accessory = this.list(lambdaQueryWrapper);
EmpBaseInfo empBaseInfo = empBaseInfoService.getById(i);
- String nameAndCertificateNumb = empBaseInfo.getEmpName()+"_"+empBaseInfo.getCertificateNumb()+"/";
+ String nameAndCertificateNumb = empBaseInfo.getEmpName() + "_" + empBaseInfo.getCertificateNumb() + "/";
//创建个人文件夹
- String singlefileStr = mianFileStr+nameAndCertificateNumb;
+ String singlefileStr = mianFileStr + nameAndCertificateNumb;
FileUtil.mkdir(singlefileStr);
- accessory.stream().forEach(a->{
+ accessory.stream().forEach(a -> {
Label label = labelService.getById(a.getLabelid());
- FileUtil.copy(properties.getUploadSinglePath() + nameAndCertificateNumb + a.getFilesaddress(),singlefileStr+label.getLabelname()+"/"+a.getFilesname(),true);
+ FileUtil.copy(properties.getUploadSinglePath() + nameAndCertificateNumb + a.getFilesaddress(), singlefileStr + label.getLabelname() + "/" + a.getFilesname(), true);
});
});
ZipUtil.zip(mianFileStr);
try {
- MyUtil.downloadFile(new File(new StringBuilder().append(mianFileStr, 0, mianFileStr.length() - 1).append(".zip").toString()),response);
+ MyUtil.downloadFile(new File(new StringBuilder().append(mianFileStr, 0, mianFileStr.length() - 1).append(".zip").toString()), response);
} catch (IOException e) {
- log.error("下载文件异常",e);
+ log.error("下载文件异常", e);
}
FileUtil.del(new StringBuilder().append(mianFileStr, 0, mianFileStr.length() - 1).append(".zip").toString());
FileUtil.del(mianFileStr);
@@ -270,9 +294,57 @@
@Override
public Integer getLabelCount(Long labelId) {
- LambdaQueryWrapper<EmpAccessory> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(EmpAccessory::getDelFlag,0);
- wrapper.eq(EmpAccessory::getLabelid,labelId);
+ LambdaQueryWrapper<EmpAccessory> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(EmpAccessory::getDelFlag, 0);
+ wrapper.eq(EmpAccessory::getLabelid, labelId);
return this.count(wrapper);
}
+
+ @Override
+ public void autoInstall(String fileids) {
+ File[] list = FileUtil.ls(fileids);
+ for (File file : list) {
+
+ String[] fileName = file.getName().split("_");
+ List<EmpBaseInfo> empBaseInfo = empBaseInfoService.list(new LambdaQueryWrapper<EmpBaseInfo>().eq(EmpBaseInfo::getCertificateNumb, fileName[1]).ne(EmpBaseInfo::getDelFlag, 1));
+ if (0 == empBaseInfo.size()) {
+ continue;
+ }
+ File[] childlist = FileUtil.ls(fileids+"/"+file.getName());
+ for (File file1 : childlist) {
+ EmpAccessory accessory = new EmpAccessory();
+ if (file1.getName().indexOf("体检")>=0){
+ accessory.setLabelid(142445218121729L);
+ }else if (file1.getName().indexOf("合同")>=0){
+ accessory.setLabelid(142445285230593L);
+ }else if (file1.getName().indexOf("入职")>=0||file1.getName().indexOf("务工")>=0){
+ accessory.setLabelid(143073554221057L);
+ }else if (file1.getName().indexOf("身份")>=0){
+ accessory.setLabelid(143007818991617L);
+ }else if (file1.getName().indexOf("银行卡")>=0){
+ accessory.setLabelid(143073768130561L);
+ }else if (file1.getName().indexOf("证")>=0){
+ accessory.setLabelid(143073812170753L);
+ }else{
+ accessory.setLabelid(142445180372993L);
+ }
+
+ accessory.setCreatetime(new Date());
+ accessory.setCreator(FebsUtil.getUserId());
+ 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));
+ }
+ accessory.setAccessoryid(SequenceUtil.generateId(0L, ModuleCode.HR_FIlE));
+ accessory.setFilesname(file1.getName());
+ accessory.setModifier(FebsUtil.getUserId());
+ accessory.setModifytime(new Date());
+ accessory.setVersion(0);
+ this.save(accessory);
+ }
+
+ }
+ }
}
--
Gitblit v1.8.0