From 4c136bc8d4c7d16a7918a06bb4bda5f34a54ba5d Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期一, 01 三月 2021 00:01:05 +0800
Subject: [PATCH] 修改bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java | 127 ++++++++++++++++++++++-------------------
1 files changed, 68 insertions(+), 59 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 591df22..b6f4d6d 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
@@ -21,6 +21,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;
@@ -62,7 +63,10 @@
@Override
public IPage<Map<String, Object>> findEmpAccessorys(QueryRequest request, EmpAccessoryVO vo) {
- QueryWrapper<EmpAccessoryVO> queryWrapper = new QueryWrapper<>();
+ QueryWrapper<EmpAccessoryVO> queryWrapper = new QueryWrapper<>();
+ 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());
+ }
if (StrUtil.isNotBlank(vo.getEmpName())) {
queryWrapper.like("a.empName", vo.getEmpName());
}
@@ -79,49 +83,49 @@
queryWrapper.between("a.entryDate", vo.getEntryDate().split(",")[0], vo.getEntryDate().split(",")[1]);
}
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);
+ 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.isNotBlank(vo.getArchivesStatus())) {
- if (!StrUtil.equals(vo.getArchivesStatus(), "-1")) {
- queryWrapper.eq("a.archivesStatus", vo.getArchivesStatus());
- }
+ queryWrapper.in("a.archivesStatus", vo.getArchivesStatus());
}
if (StrUtil.isNotBlank(vo.getEducation())) {
- if (!StrUtil.equals(vo.getEducation(), "-1")) {
- queryWrapper.eq("a.education", vo.getEducation());
- }
+ queryWrapper.in("a.education", vo.getEducation());
}
if (StrUtil.isNotBlank(vo.getSex())) {
- if (!StrUtil.equals(vo.getSex(), "-1")) {
- queryWrapper.eq("a.sex", vo.getSex());
- }
+ queryWrapper.in("a.sex", vo.getSex());
}
if (StrUtil.isNotBlank(vo.getInsuranceType())) {
- if (!StrUtil.equals(vo.getInsuranceType(), "-1")) {
- queryWrapper.eq("a.insuranceType", vo.getInsuranceType());
- }
+ queryWrapper.in("a.insuranceType", vo.getInsuranceType());
}
if (StrUtil.isNotBlank(vo.getPolitics())) {
- if (!StrUtil.equals(vo.getPolitics(), "-1")) {
- queryWrapper.eq("a.politics", vo.getPolitics());
- }
+ queryWrapper.in("a.politics", vo.getPolitics());
+ }
+ if (StrUtil.isNotBlank(vo.getEmpStatus())) {
+ queryWrapper.in("a.empStatus", vo.getEmpStatus());
+ }
+ if (StrUtil.isNotBlank(vo.getPolitics())) {
+ queryWrapper.in("a.politics", vo.getPolitics());
}
queryWrapper.eq("a.delFlag", 0);
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
@@ -173,20 +177,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,7 +202,7 @@
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());
});
@@ -208,17 +211,14 @@
}
@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 +226,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