ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(企标稽查流程): 80750

Browse Source
This commit is contained in:
yjz
2024-02-01 15:16:43 +08:00
parent de3060c423
commit 83a9a71884
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java
+5 -10
View File
@@ -38,7 +38,6 @@ import javax.servlet.http.HttpServletRequest;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Collectors;
/** /**
@@ -228,20 +227,16 @@ public class ProcessEsInspectServiceImpl extends ServiceImpl<ProcessEsInspectMap
.eq(OSSFile::getStandardId, lawsEnterpriseStandard.getId()) .eq(OSSFile::getStandardId, lawsEnterpriseStandard.getId())
.orderByDesc(OSSFile::getCreateTime)); .orderByDesc(OSSFile::getCreateTime));
if (!list.isEmpty()){ 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, 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_REVIEW, FieldCommon.FILE_DRAFT_FOR_APPROVAL,
FieldCommon.FILE_DRAFT_FOR_COMMENT, FieldCommon.FILE_DRAFT}; FieldCommon.FILE_DRAFT_FOR_COMMENT, FieldCommon.FILE_DRAFT};
for (String fileType : fileTypeArr) { for (String fileType : fileTypeArr) {
Optional<OSSFile> optional = list.stream().filter(v -> Optional<OSSFile> optional = list.stream()
fileType.equals(v.getStandardFileType())).findFirst(); .filter(v -> fileType.equals(v.getStandardFileType())
&& (v.getFileName().endsWith(".pdf")
|| v.getFileName().endsWith(".docx")
|| v.getFileName().endsWith(".doc"))).findFirst();
if (optional.isPresent()){ if (optional.isPresent()){
return optional.get(); return optional.get();
} }