From 779e022d1bc6cfa93ff1a0b97057e47628dd167e Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Wed, 24 Jan 2024 16:40:34 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E4=BC=81=E6=A0=87=E7=A8=BD=E6=9F=A5?= =?UTF-8?q?=E6=B5=81=E7=A8=8B):=2080928?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProcessEsInspectServiceImpl.java | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java index 72ca7fef..c7b7367a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java @@ -37,7 +37,8 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletRequest; import java.util.List; import java.util.Objects; -import java.util.concurrent.atomic.AtomicReference; +import java.util.Optional; +import java.util.stream.Collectors; /** @@ -217,7 +218,6 @@ public class ProcessEsInspectServiceImpl extends ServiceImpl ossFile = new AtomicReference<>(new OSSFile()); EnterpriseStandardInspect enterpriseStandardInspect = enterpriseStandardInspectService.getById(inspectId); LawsEnterpriseStandard lawsEnterpriseStandard = lawsEnterpriseStandardService.getOne( new LambdaQueryWrapper() @@ -227,17 +227,23 @@ public class ProcessEsInspectServiceImpl extends ServiceImpl() .eq(OSSFile::getStandardId, lawsEnterpriseStandard.getId()) .orderByDesc(OSSFile::getCreateTime)); - // 发布稿>修改单>报批稿>送审稿>征求意见稿>草稿 if (!list.isEmpty()){ + // pdf、word + list = list.stream() + .filter(v -> v.getFileName().endsWith(".pdf") + || v.getFileName().endsWith(".docx") + || v.getFileName().endsWith(".doc")).collect(Collectors.toList()); + + // 发布稿>修改单>报批稿>送审稿>征求意见稿>草稿 String[] fileTypeArr = {FieldCommon.FILE_PUBLISH_OF_ORIGINAL, FieldCommon.FILE_MODIFICATION_LIST, FieldCommon.FILE_DRAFT_FOR_REVIEW, FieldCommon.FILE_DRAFT_FOR_APPROVAL, FieldCommon.FILE_DRAFT_FOR_COMMENT, FieldCommon.FILE_DRAFT}; for (String fileType : fileTypeArr) { - list.stream().filter(v -> - fileType.equals(v.getStandardFileType())).findFirst() - .ifPresent(ossFile::set); - if (!Objects.isNull(ossFile.get()) && StringUtils.isNotBlank(ossFile.get().getId())){ - return ossFile.get(); + Optional optional = list.stream().filter(v -> + fileType.equals(v.getStandardFileType())).findFirst(); + + if (optional.isPresent()){ + return optional.get(); } } }