From c979b4824ab9a28392696dc829cd01f65b54e83b Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期日, 21 二月 2021 17:08:06 +0800
Subject: [PATCH] 增加导入员工其它信息
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java | 58 ++++++++++++++++++++++++++++------------------------------
1 files changed, 28 insertions(+), 30 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..df38b2c 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
@@ -121,7 +121,8 @@
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 +174,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 +199,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 +208,15 @@
}
@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,31 +224,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);
--
Gitblit v1.8.0