From 7231552281feb6051cbb1d4c17f0d17f4d8cd7e3 Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期六, 20 二月 2021 00:56:00 +0800
Subject: [PATCH] 智搜查询调整
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java | 62 +++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 7 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 1442e08..ae0f802 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
@@ -12,11 +12,13 @@
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cc.mrbird.febs.server.hr.service.ILabelService;
import cc.mrbird.febs.server.hr.vo.EmpAccessoryVO;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.lang.Dict;
import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.ZipUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.springframework.stereotype.Service;
@@ -46,7 +48,7 @@
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
public class EmpAccessoryServiceImpl extends ServiceImpl<EmpAccessoryMapper, EmpAccessory> implements IEmpAccessoryService {
-
+ private final ILabelService labelService;
private final EmpAccessoryMapper empAccessoryMapper;
private final FebsServerHrProperties properties;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
@@ -119,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
@@ -172,11 +175,10 @@
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.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);
@@ -205,4 +207,50 @@
}
+ @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);
+ wapper.set(EmpAccessory::getModifytime,new Date());
+ wapper.set(EmpAccessory::getLabelid,labelid);
+ this.update(wapper);
+
+ }
+
+ @Override
+ public void singledownload(String empIds, Long labelid, HttpServletRequest request, HttpServletResponse response) throws IOException {
+ String[] arr = empIds.split(",");
+ //主文件夹
+ 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);
+ }
+ List<EmpAccessory> accessory = this.list(lambdaQueryWrapper);
+ EmpBaseInfo empBaseInfo = empBaseInfoService.getById(i);
+ String nameAndCertificateNumb = empBaseInfo.getEmpName()+"_"+empBaseInfo.getCertificateNumb()+"/";
+ //创建个人文件夹
+ String singlefileStr = mianFileStr+nameAndCertificateNumb;
+ FileUtil.mkdir(singlefileStr);
+ accessory.stream().forEach(a->{
+ Label label = labelService.getById(a.getLabelid());
+ 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);
+ } catch (IOException e) {
+ log.error("下载文件异常",e);
+ }
+ FileUtil.del(new StringBuilder().append(mianFileStr, 0, mianFileStr.length() - 1).append(".zip").toString());
+ FileUtil.del(mianFileStr);
+ }
}
--
Gitblit v1.8.0