From 8a2f817bc1a489f873e048d36e24f355bdb55756 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期五, 05 三月 2021 15:44:05 +0800
Subject: [PATCH] 修改bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java | 66 +++++++++++++++++++++------------
1 files changed, 42 insertions(+), 24 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 2a4d082..a7d2986 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");
@@ -68,16 +72,16 @@
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());
}
if (StrUtil.isNotBlank(vo.getEmpName())) {
- queryWrapper.like("a.empName", vo.getEmpName());
+ queryWrapper.like("a.empName", vo.getEmpName().split(","));
}
if (StrUtil.isNotBlank(vo.getEmpNumb())) {
- queryWrapper.like("a.empNumb", vo.getEmpNumb());
+ queryWrapper.like("a.empNumb", vo.getEmpNumb().split(","));
}
if (StrUtil.isNotBlank(vo.getCertificateNumb())) {
- queryWrapper.like("a.certificateNumb", vo.getCertificateNumb());
+ queryWrapper.like("a.certificateNumb", vo.getCertificateNumb().split(","));
}
if (StrUtil.isNotBlank(vo.getDeptName())) {
- queryWrapper.like("a.deptName", 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]);
@@ -85,40 +89,51 @@
if (StrUtil.isNotBlank(vo.getAge())) {
String[] arr = vo.getAge().split(",");
for (String s : arr) {
- if (StrUtil.equals(s, "1")) {
- queryWrapper.between("a.age", 18, 29);
- } if (StrUtil.equals(s, "2")) {
- queryWrapper.between("a.age", 30, 39);
- } if (StrUtil.equals(s, "3")) {
- queryWrapper.between("a.age", 40, 49);
- } if (StrUtil.equals(s, "4")) {
- queryWrapper.between("a.age", 50, 59);
- } if (StrUtil.equals(s, "5")) {
- queryWrapper.between("a.age", 60, 69);
- } if (StrUtil.equals(s, "6")) {
- queryWrapper.ge("a.age", 69);
+ 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())) {
- queryWrapper.in("a.archivesStatus", vo.getArchivesStatus());
+ queryWrapper.in("a.archivesStatus", vo.getArchivesStatus().split(","));
}
if (StrUtil.isNotBlank(vo.getEducation())) {
- queryWrapper.in("a.education", vo.getEducation());
+ queryWrapper.in("a.education", vo.getEducation().split(","));
}
if (StrUtil.isNotBlank(vo.getSex())) {
- queryWrapper.in("a.sex", vo.getSex());
+ queryWrapper.in("a.sex", vo.getSex().split(","));
}
if (StrUtil.isNotBlank(vo.getInsuranceType())) {
- queryWrapper.in("a.insuranceType", vo.getInsuranceType());
+ queryWrapper.in("a.insuranceType", vo.getInsuranceType().split(","));
}
if (StrUtil.isNotBlank(vo.getPolitics())) {
- queryWrapper.in("a.politics", vo.getPolitics());
+ queryWrapper.in("a.politics", vo.getPolitics().split(","));
}
if (StrUtil.isNotBlank(vo.getEmpStatus())) {
- queryWrapper.in("a.empStatus", vo.getEmpStatus());
+ queryWrapper.in("a.empStatus", vo.getEmpStatus().split(","));
+ }
+ 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();
IPage<Map<String, Object>> mapIPage = empAccessoryMapper.selectPageVo(page, queryWrapper, querySql);
@@ -201,7 +216,11 @@
EmpBaseInfo empBaseInfo = empBaseInfoService.getById(accessory.getEmpid());
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);
@@ -210,7 +229,6 @@
@Override
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);
--
Gitblit v1.8.0