|
|
|
@ -2426,21 +2426,29 @@ public class PatrolTaskController extends BaseController { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
item.setFilterDesc(item.getDesc()); |
|
|
|
item.setDesc(""); |
|
|
|
} |
|
|
|
newList.addAll(filterList); |
|
|
|
|
|
|
|
if (StringUtils.isNotEmpty(resultAnalysis.getAlgName())) { |
|
|
|
newList = newList.stream().filter((element) -> element.getAlgName().equals(resultAnalysis.getAlgName())).collect(Collectors.toList()); |
|
|
|
newList = newList.stream().filter((element) -> resultAnalysis.getAlgName().equals(element.getAlgName())).collect(Collectors.toList()); |
|
|
|
} |
|
|
|
|
|
|
|
if (StringUtils.isNotEmpty(resultAnalysis.getFilterDesc())) { |
|
|
|
newList = newList.stream().filter((element) -> element.getFilterDesc().equals(resultAnalysis.getFilterDesc())).collect(Collectors.toList()); |
|
|
|
newList = newList.stream().filter((element) -> resultAnalysis.getFilterDesc().equals(element.getFilterDesc())).collect(Collectors.toList()); |
|
|
|
} |
|
|
|
|
|
|
|
PageDomain pageDomain = TableSupport.buildPageRequest(); |
|
|
|
int pageNum = pageDomain.getPageNum(); |
|
|
|
int pageSize = pageDomain.getPageSize(); |
|
|
|
int toNum = Math.min(newList.size(), pageNum * pageSize); |
|
|
|
List<PatrolData> pageList = newList.subList((pageNum - 1) * pageSize, toNum); |
|
|
|
|
|
|
|
if (newList.size() > maxNum) { |
|
|
|
return ResponseEntity.ok("超过最大导出数量:" + maxNum + "条,请结合查询条件减少导出的数量!"); |
|
|
|
} else { |
|
|
|
exportExcel(response, newList); |
|
|
|
exportExcel(response, pageList); |
|
|
|
logger.info("任务详情导出耗时: {} ms", (System.currentTimeMillis() - start)); |
|
|
|
return ResponseEntity.ok("数据导出成功!"); |
|
|
|
} |
|
|
|
|