|
|
@ -8,6 +8,7 @@ import lombok.Data;
|
|
|
|
|
|
|
|
|
|
|
|
import java.util.*;
|
|
|
|
import java.util.*;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.List;
|
|
|
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 案件证据目录
|
|
|
|
* 案件证据目录
|
|
|
@ -41,11 +42,6 @@ public class EvidenceDirectoryDTO {
|
|
|
|
private List<EvidenceDirectoryDTO> child;
|
|
|
|
private List<EvidenceDirectoryDTO> child;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
* 文件id,接收前端传入的参数
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
private List<String> fileIdList = new ArrayList<>();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 文件信息
|
|
|
|
* 文件信息
|
|
|
|
*/
|
|
|
|
*/
|
|
|
@ -113,8 +109,8 @@ public class EvidenceDirectoryDTO {
|
|
|
|
|
|
|
|
|
|
|
|
public List<String> listAllFileId(){
|
|
|
|
public List<String> listAllFileId(){
|
|
|
|
List<String> fileIdList = new ArrayList<>();
|
|
|
|
List<String> fileIdList = new ArrayList<>();
|
|
|
|
if (CollUtil.isNotEmpty(this.fileIdList)){
|
|
|
|
if (CollUtil.isNotEmpty(this.fileInfoList)){
|
|
|
|
fileIdList.addAll(this.fileIdList);
|
|
|
|
fileIdList.addAll(this.fileInfoList.stream().map(EvidenceFileDTO::getFileId).toList());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (CollUtil.isNotEmpty(this.child)){
|
|
|
|
if (CollUtil.isNotEmpty(this.child)){
|
|
|
|
for (EvidenceDirectoryDTO child : this.getChild()) {
|
|
|
|
for (EvidenceDirectoryDTO child : this.getChild()) {
|
|
|
@ -261,4 +257,11 @@ public class EvidenceDirectoryDTO {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public List<String> getFileIdList() {
|
|
|
|
|
|
|
|
if (CollUtil.isNotEmpty(this.fileInfoList)){
|
|
|
|
|
|
|
|
return this.fileInfoList.stream().map(EvidenceFileDTO::getFileId).collect(Collectors.toList());
|
|
|
|
|
|
|
|
}else {
|
|
|
|
|
|
|
|
return new ArrayList<>();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|