WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

虚拟清单---导出

Browse Source
This commit is contained in:
zhn
2022-04-22 13:39:46 +08:00
parent f7f608368c
commit f045b83232
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+16 -6
View File
@@ -1469,13 +1469,23 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
if(StringUtils.isBlank(serialNumber)){ if(StringUtils.isBlank(serialNumber)){
continue; continue;
} }
List<OSSFile> designFileList = fileInfos.stream().filter(e -> designDeliverableTemplate.contains(e.getId())).collect(Collectors.toList()); List<OSSFile> designFileList = new ArrayList<>();
List<OSSFile> prehomoFileList = fileInfos.stream().filter(e -> prehomoDeliverableTemplate.contains(e.getId())).collect(Collectors.toList()); List<OSSFile> prehomoFileList = new ArrayList<>();
List<OSSFile> verifyFileList = fileInfos.stream().filter(e -> verifyDeliverableTemplate.contains(e.getId())).collect(Collectors.toList()); List<OSSFile> verifyFileList = new ArrayList<>();
List<OSSFile> oSSFileList = new ArrayList<>(); List<OSSFile> oSSFileList = new ArrayList<>();
oSSFileList.addAll(designFileList); if(StringUtils.isNotBlank(designDeliverableTemplate)){
oSSFileList.addAll(prehomoFileList); designFileList = fileInfos.stream().filter(e -> designDeliverableTemplate.contains(e.getId())).collect(Collectors.toList());
oSSFileList.addAll(verifyFileList); oSSFileList.addAll(designFileList);
}
if(StringUtils.isNotBlank(prehomoDeliverableTemplate)){
prehomoFileList = fileInfos.stream().filter(e -> prehomoDeliverableTemplate.contains(e.getId())).collect(Collectors.toList());
oSSFileList.addAll(prehomoFileList);
}
if(StringUtils.isNotBlank(verifyDeliverableTemplate)){
verifyFileList = fileInfos.stream().filter(e -> verifyDeliverableTemplate.contains(e.getId())).collect(Collectors.toList());
oSSFileList.addAll(verifyFileList);
}
if(oSSFileList.size() != 0){ if(oSSFileList.size() != 0){
String fileNowPath = uploadpath + "/tempZip/" + serialNumber; String fileNowPath = uploadpath + "/tempZip/" + serialNumber;
File file = new File(fileNowPath); File file = new File(fileNowPath);