From 1b39b59699b8209e243ce151e5493b0b25f36ecb Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期日, 07 三月 2021 13:27:53 +0800
Subject: [PATCH] fix(bug修复): 附件与在职员工
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java | 206 +++++++++++++++++++++++++++++++--------------------
1 files changed, 125 insertions(+), 81 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 7f21cca..a3d5908 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;
@@ -21,6 +22,7 @@
import cn.hutool.core.util.ZipUtil;
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;
@@ -30,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;
@@ -51,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");
@@ -61,73 +66,103 @@
private Snowflake snowflake = IdUtil.getSnowflake(ModuleCode.HR_FIlE, 1);
@Override
- public IPage<Map<String,Object>> findEmpAccessorys(QueryRequest request, EmpAccessoryVO vo) {
+ public IPage<Map<String, Object>> findEmpAccessorys(QueryRequest request, EmpAccessoryVO vo) {
QueryWrapper<EmpAccessoryVO> queryWrapper = new QueryWrapper<>();
- if (StrUtil.isNotBlank(vo.getEmpName())){
- queryWrapper.like("a.empName",vo.getEmpName());
+ queryWrapper.eq("a.delFlag", 0);
+ if (StrUtil.isNotBlank(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.getEmpNumb())){
- queryWrapper.like("a.empNumb",vo.getEmpNumb());
+ if (StrUtil.isNotBlank(vo.getEmpName())) {
+ queryWrapper.like("a.empName", vo.getEmpName());
}
- if (StrUtil.isNotBlank(vo.getCertificateNumb())){
- queryWrapper.like("a.certificateNumb",vo.getCertificateNumb());
+ if (StrUtil.isNotBlank(vo.getEmpNumb())) {
+ queryWrapper.like("a.empNumb", vo.getEmpNumb());
}
- if (StrUtil.isNotBlank(vo.getDeptName())){
- queryWrapper.like("a.deptName",vo.getDeptName());
+ if (StrUtil.isNotBlank(vo.getCertificateNumb())) {
+ queryWrapper.like("a.certificateNumb", vo.getCertificateNumb());
}
- if (StrUtil.isNotBlank(vo.getEntryDate())){
- queryWrapper.between("a.entryDate",vo.getEntryDate().split(",")[0],vo.getEntryDate().split(",")[1]);
+ if (StrUtil.isNotBlank(vo.getDeptName())) {
+ queryWrapper.like("a.deptName", vo.getDeptName());
}
- if(StrUtil.isNotBlank(vo.getAge())){
- if(StrUtil.equals(vo.getAge(),"1")){
- queryWrapper.between("a.age",18,29);
- }else if(StrUtil.equals(vo.getAge(),"2")){
- queryWrapper.between("a.age",30,39);
- }else if(StrUtil.equals(vo.getAge(),"3")){
- queryWrapper.between("a.age",40,49);
- }else if(StrUtil.equals(vo.getAge(),"4")){
- queryWrapper.between("a.age",50,59);
- }else if(StrUtil.equals(vo.getAge(),"5")){
- queryWrapper.between("a.age",60,69);
- }else if(StrUtil.equals(vo.getAge(),"6")){
- queryWrapper.ge("a.age",69);
+ // 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]);
+ }
+ if (StrUtil.isNotBlank(vo.getAge())) {
+ String[] arr = vo.getAge().split(",");
+ for (String s : arr) {
+ if (StrUtil.equals(s, "18-29")) {
+ queryWrapper.or().between("a.age", 18, 29);
+ }
+ if (StrUtil.equals(s, "30-39")) {
+ queryWrapper.or().between("a.age", 30, 39);
+ }
+ if (StrUtil.equals(s, "40-49")) {
+ queryWrapper.or().between("a.age", 40, 49);
+ }
+ if (StrUtil.equals(s, "50-59")) {
+ queryWrapper.or().between("a.age", 50, 59);
+ }
+ if (StrUtil.equals(s, "60-69")) {
+ queryWrapper.or().between("a.age", 60, 69);
+ }
+ if (StrUtil.equals(s, "69-999")) {
+ queryWrapper.or().ge("a.age", 69);
+ }
}
+
}
- if(StrUtil.isNotBlank(vo.getArchivesStatus())){
- if(!StrUtil.equals(vo.getArchivesStatus(),"-1")) {
- queryWrapper.eq("a.archivesStatus", vo.getArchivesStatus());
- }
+ if (StrUtil.isNotBlank(vo.getArchivesStatus())) {
+ queryWrapper.in("a.archivesStatus", vo.getArchivesStatus().split(","));
}
- if(StrUtil.isNotBlank(vo.getEducation())){
- if(!StrUtil.equals(vo.getEducation(),"-1")) {
- queryWrapper.eq("a.education", vo.getEducation());
- }
+ if (StrUtil.isNotBlank(vo.getEducation())) {
+ queryWrapper.in("a.education", vo.getEducation().split(","));
}
- if(StrUtil.isNotBlank(vo.getSex())){
- if(!StrUtil.equals(vo.getSex(),"-1")) {
- queryWrapper.eq("a.sex", vo.getSex());
- }
+ if (StrUtil.isNotBlank(vo.getSex())) {
+ queryWrapper.in("a.sex", vo.getSex().split(","));
}
- if(StrUtil.isNotBlank(vo.getInsuranceType())){
- if(!StrUtil.equals(vo.getInsuranceType(),"-1")) {
- queryWrapper.eq("a.insuranceType", vo.getInsuranceType());
- }
+ if (StrUtil.isNotBlank(vo.getInsuranceType())) {
+ queryWrapper.in("a.insuranceType", vo.getInsuranceType().split(","));
}
- if(StrUtil.isNotBlank(vo.getPolitics())){
- if(!StrUtil.equals(vo.getPolitics(),"-1")) {
- queryWrapper.eq("a.politics", vo.getPolitics());
- }
+ if (StrUtil.isNotBlank(vo.getPolitics())) {
+ queryWrapper.in("a.politics", vo.getPolitics().split(","));
}
- queryWrapper.eq("a.delFlag",0);
+ if (StrUtil.isNotBlank(vo.getEmpStatus())) {
+ queryWrapper.in("a.empStatus", vo.getEmpStatus().split(","));
+ }
+ if (StrUtil.isNotBlank(vo.getPolitics())) {
+ queryWrapper.in("a.politics", vo.getPolitics().split(","));
+ }
+
+ 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();
- return empAccessoryMapper.selectPageVo(page, queryWrapper,querySql);
+ IPage<Map<String, Object>> mapIPage = empAccessoryMapper.selectPageVo(page, queryWrapper, querySql);
+ return mapIPage;
}
@Override
public List<EmpAccessory> findEmpAccessorys(EmpAccessory empAccessory) {
LambdaQueryWrapper<EmpAccessory> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpAccessory::getDelFlag,0);
+ queryWrapper.eq(EmpAccessory::getDelFlag, 0);
if (null != empAccessory.getLabelid()) {
queryWrapper.eq(EmpAccessory::getLabelid, empAccessory.getLabelid());
}
@@ -142,10 +177,10 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void createEmpAccessory(Long labelid, MultipartFile file,Long empId) throws FebsException, IOException {
+ 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());
+ String nameAndCertificateNumb = empBaseInfo.getEmpName() + "_" + empBaseInfo.getCertificateNumb() + "/";
+ Dict dict = MyUtil.filesUpload(file, properties.getUploadSinglePath() + nameAndCertificateNumb, snowflake.nextIdStr());
EmpAccessory accessory = new EmpAccessory();
accessory.setCreatetime(new Date());
accessory.setCreator(operatorId);
@@ -173,20 +208,19 @@
public void deleteEmpAccessory(String accessoryids) {
String[] arr = accessoryids.split(",");
LambdaUpdateWrapper<EmpAccessory> wapper = new LambdaUpdateWrapper<>();
- wapper.in(EmpAccessory::getAccessoryid,arr);
- EmpAccessory accessory = new EmpAccessory();
- accessory.setModifier(operatorId);
- accessory.setModifytime(new Date());
- accessory.setDelFlag(1);
- this.update(accessory,wapper);
+ 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());
});
}
@@ -199,26 +233,27 @@
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()));
- fileName.add(accessory.getFilesname());
+ 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);
+ }
});
MyUtil.download(request, response, files, fileName);
}
@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);
- EmpAccessory empAccessory = new EmpAccessory();
- empAccessory.setModifier(operatorId);
- empAccessory.setModifytime(new Date());
- empAccessory.setLabelid(labelid);
- empAccessory.setEmpid(empId);
- this.update(empAccessory,wapper);
+ wapper.set(EmpAccessory::getModifier, operatorId);
+ wapper.set(EmpAccessory::getModifytime, new Date());
+ wapper.set(EmpAccessory::getLabelid, labelid);
+ this.update(wapper);
}
@@ -226,33 +261,42 @@
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);
}
+
+
+ @Override
+ public Integer getLabelCount(Long labelId) {
+ LambdaQueryWrapper<EmpAccessory> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(EmpAccessory::getDelFlag, 0);
+ wrapper.eq(EmpAccessory::getLabelid, labelId);
+ return this.count(wrapper);
+ }
}
--
Gitblit v1.8.0