|
@@ -973,12 +973,18 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
|
|
//找出文件集合中的最大最小时间
|
|
//找出文件集合中的最大最小时间
|
|
List<String> fileTimeList = new ArrayList<>();
|
|
List<String> fileTimeList = new ArrayList<>();
|
|
for(ArchiveFile file:waitArchiveFiles){
|
|
for(ArchiveFile file:waitArchiveFiles){
|
|
- fileTimeList.add(file.getFileTime());
|
|
|
|
|
|
+ if(StringUtils.isNotEmpty(file.getFileTime())){
|
|
|
|
+ fileTimeList.add(file.getFileTime());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ if(fileTimeList.size()>0){
|
|
|
|
+ Collections.sort(fileTimeList);
|
|
|
|
+ String startDate=fileTimeList.get(0);
|
|
|
|
+ String endDate=fileTimeList.get(fileTimeList.size()-1);
|
|
|
|
+ return startDate+","+endDate;
|
|
|
|
+ }else{
|
|
|
|
+ return "";
|
|
}
|
|
}
|
|
- Collections.sort(fileTimeList);
|
|
|
|
- String startDate=fileTimeList.get(0);
|
|
|
|
- String endDate=fileTimeList.get(fileTimeList.size()-1);
|
|
|
|
- return startDate+","+endDate;
|
|
|
|
}
|
|
}
|
|
|
|
|
|
private String builtArchiveName(List<ArchiveFile> waitArchiveFiles, ArchiveTreeContract node,boolean isCrossNode){
|
|
private String builtArchiveName(List<ArchiveFile> waitArchiveFiles, ArchiveTreeContract node,boolean isCrossNode){
|