虚拟清单---导出
This commit is contained in:
+16
-6
@@ -1469,13 +1469,23 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
|
||||
if(StringUtils.isBlank(serialNumber)){
|
||||
continue;
|
||||
}
|
||||
List<OSSFile> designFileList = fileInfos.stream().filter(e -> designDeliverableTemplate.contains(e.getId())).collect(Collectors.toList());
|
||||
List<OSSFile> prehomoFileList = fileInfos.stream().filter(e -> prehomoDeliverableTemplate.contains(e.getId())).collect(Collectors.toList());
|
||||
List<OSSFile> verifyFileList = fileInfos.stream().filter(e -> verifyDeliverableTemplate.contains(e.getId())).collect(Collectors.toList());
|
||||
List<OSSFile> designFileList = new ArrayList<>();
|
||||
List<OSSFile> prehomoFileList = new ArrayList<>();
|
||||
List<OSSFile> verifyFileList = new ArrayList<>();
|
||||
List<OSSFile> oSSFileList = new ArrayList<>();
|
||||
oSSFileList.addAll(designFileList);
|
||||
oSSFileList.addAll(prehomoFileList);
|
||||
oSSFileList.addAll(verifyFileList);
|
||||
if(StringUtils.isNotBlank(designDeliverableTemplate)){
|
||||
designFileList = fileInfos.stream().filter(e -> designDeliverableTemplate.contains(e.getId())).collect(Collectors.toList());
|
||||
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){
|
||||
String fileNowPath = uploadpath + "/tempZip/" + serialNumber;
|
||||
File file = new File(fileNowPath);
|
||||
|
||||
Reference in New Issue
Block a user