febs-common/febs-common-core/pom.xml
@@ -104,11 +104,6 @@ <groupId>cn.hutool</groupId> <artifactId>hutool-all</artifactId> <version>5.5.8</version> </dependency> <dependency> <groupId>cn.hutool</groupId> <artifactId>hutool-all</artifactId> <version>5.5.8</version> <scope>compile</scope> </dependency> </dependencies> febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccessoryMapper.xml
@@ -11,6 +11,6 @@ label.labelCode, '''' ) ) FROM t_label label order by label.sort),' from t_emp_baseinfo a') as querySql FROM t_label label where label.delFlag = 0 order by label.sort),' from t_emp_baseinfo a') as querySql </select> </mapper> febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java
@@ -122,6 +122,8 @@ 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 +175,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 +200,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 +209,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 +225,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); febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/FilesUploadServiceImpl.java
@@ -108,11 +108,10 @@ String[] arr = fileids.split(","); LambdaUpdateWrapper<FilesUpload> wapper = new LambdaUpdateWrapper<>(); wapper.in(FilesUpload::getFilesid, arr); FilesUpload filesUpload = new FilesUpload(); filesUpload.setModifier(operatorId); filesUpload.setModifytime(new Date()); filesUpload.setDelFlag(1); this.update(filesUpload,wapper); wapper.set(FilesUpload::getDelFlag,1); wapper.set(FilesUpload::getModifier,operatorId); wapper.set(FilesUpload::getModifytime,new Date()); this.update(wapper); LambdaQueryWrapper<FilesUpload> queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.in(FilesUpload::getFilesid, arr); @@ -156,11 +155,10 @@ LambdaUpdateWrapper<FilesUpload> wapper = new LambdaUpdateWrapper<>(); wapper.in(FilesUpload::getFilesid, arr); FilesUpload filesUpload = new FilesUpload(); filesUpload.setModifier(operatorId); filesUpload.setModifytime(new Date()); filesUpload.setFolderid(folderid); this.update(filesUpload,wapper); wapper.set(FilesUpload::getFolderid,fileids); wapper.set(FilesUpload::getModifier,operatorId); wapper.set(FilesUpload::getModifytime,new Date()); this.update(wapper); }
@@ -5,6 +5,7 @@ import cc.mrbird.febs.common.core.utils.SequenceUtil; import cc.mrbird.febs.server.hr.entity.FilesUpload; import cc.mrbird.febs.server.hr.entity.Folder; import cc.mrbird.febs.server.hr.entity.Label; import cc.mrbird.febs.server.hr.mapper.FolderMapper; import cc.mrbird.febs.server.hr.service.IFolderService; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -74,10 +75,9 @@ public void deleteFolder(Folder folder) { LambdaUpdateWrapper<Folder> wapper = new LambdaUpdateWrapper<>(); wapper.eq(Folder::getFolderid,folder.getFolderid()); Folder updatefolder = new Folder(); updatefolder.setModifier(operatorId); updatefolder.setModifytime(new Date()); updatefolder.setDelFlag(1); this.update(updatefolder,wapper); wapper.set(Folder::getDelFlag,1); wapper.set(Folder::getModifier,operatorId); wapper.set(Folder::getModifytime,new Date()); this.update(wapper); } } febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/LabelServiceImpl.java
@@ -4,6 +4,7 @@ import cc.mrbird.febs.common.core.exception.FebsException; import cc.mrbird.febs.common.core.utils.FebsUtil; import cc.mrbird.febs.common.core.utils.SequenceUtil; import cc.mrbird.febs.server.hr.entity.EmpAccessory; import cc.mrbird.febs.server.hr.entity.Folder; import cc.mrbird.febs.server.hr.entity.Label; import cc.mrbird.febs.server.hr.mapper.LabelMapper; @@ -40,6 +41,7 @@ private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser()) .map(u -> u.getUserId().toString()) .orElse("1"); @Override public IPage<Label> findLabels(QueryRequest request, Label label) { LambdaQueryWrapper<Label> queryWrapper = new LambdaQueryWrapper<>(); @@ -51,7 +53,7 @@ @Override public List<Label> findLabels(Label label) { LambdaQueryWrapper<Label> queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.select(Label::getLabelcode,Label::getLabelname,Label::getLabelid).eq(Label::getDelFlag,0); queryWrapper.select(Label::getLabelcode, Label::getLabelname, Label::getLabelid).eq(Label::getDelFlag, 0); return this.baseMapper.selectList(queryWrapper); } @@ -59,11 +61,11 @@ @Transactional(rollbackFor = Exception.class) public void createLabel(Label label) throws FebsException { LambdaQueryWrapper<Label> queryWrapper = new LambdaQueryWrapper(); queryWrapper.eq(Label::getLabelname,label.getLabelname()).or().eq(Label::getLabelcode,label.getLabelcode()); queryWrapper.eq(Label::getLabelname, label.getLabelname()).or().eq(Label::getLabelcode, label.getLabelcode()); Label l = this.getOne(queryWrapper); if(StrUtil.equals(label.getLabelname(),l.getLabelname())){ throw new FebsException("标签名字重复"); }else if(StrUtil.equals(label.getLabelcode(),l.getLabelcode())){ if (null != l && StrUtil.equals(label.getLabelname(), l.getLabelname())) { throw new FebsException("标签名字重复"); } else if (null != l && StrUtil.equals(label.getLabelcode(), l.getLabelcode())) { throw new FebsException("标签code重复"); } @@ -86,11 +88,10 @@ @Transactional(rollbackFor = Exception.class) public void deleteLabel(Label label) { LambdaUpdateWrapper<Label> wapper = new LambdaUpdateWrapper<>(); wapper.eq(Label::getLabelid,label.getLabelid()); Label updateLabel = new Label(); updateLabel.setModifier(operatorId); updateLabel.setModifytime(new Date()); updateLabel.setDelFlag(1); wapper.eq(Label::getLabelid, label.getLabelid()); wapper.set(Label::getDelFlag,1); wapper.set(Label::getModifier,operatorId); wapper.set(Label::getModifytime,new Date()); this.update(wapper); } }
