diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java index 7aed79df..2a85b79f 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java @@ -76,6 +76,7 @@ import java.net.URLEncoder; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; +import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.ForkJoinPool; import java.util.stream.Collectors; @@ -1361,7 +1362,7 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { private ModelAndView exportExcelByClause(Map parameterMap) { List advancedSearchClause = getAdvancedSearchClauseExport(parameterMap); - List> list = new ArrayList<>(); + List> list = new CopyOnWriteArrayList<>(); // 标准sheet页 List lawsHomeAdvancedSearchStandardExcelVOList = @@ -1373,14 +1374,12 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { standardSheet.put(NormalExcelConstants.PARAMS, exportParams); standardSheet.put(NormalExcelConstants.DATA_LIST, lawsHomeAdvancedSearchStandardExcelVOList); list.add(standardSheet); - for (LawsHomeAdvancedSearchClauseVO lawsHomeAdvancedSearchClauseVO : advancedSearchClause) { List> clauseList = lawsHomeAdvancedSearchClauseVO.getClauseList(); List lawsHomeAdvancedSearchClauseExcelVOS = JSON.parseArray(JSON.toJSONString(clauseList), LawsHomeAdvancedSearchClauseExcelVO.class); // 条款详情 - for (LawsHomeAdvancedSearchClauseExcelVO lawsHomeAdvancedSearchClauseExcelVO : - lawsHomeAdvancedSearchClauseExcelVOS) { + lawsHomeAdvancedSearchClauseExcelVOS.parallelStream().forEach(lawsHomeAdvancedSearchClauseExcelVO->{ List sarFileSplitItemsValEOS = sarFileSplitItemsValEOMapper.findList( new QueryWrapper() .eq("item_id", lawsHomeAdvancedSearchClauseExcelVO.getId()) @@ -1393,11 +1392,12 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { .collect(Collectors.joining("\n\r")); lawsHomeAdvancedSearchClauseExcelVO.setItemContent(itemContents); } - } + }); + // 条款sheet页 Map clauseSheet = new HashMap<>(); clauseSheet.put(NormalExcelConstants.CLASS, LawsHomeAdvancedSearchClauseExcelVO.class); - ExportParams exportParamss = new ExportParams(null, lawsHomeAdvancedSearchClauseVO.getStandardNumber()); + ExportParams exportParamss = new ExportParams(null, lawsHomeAdvancedSearchClauseVO.getStandardNumber().replace("/"," ")); exportParamss.setType(ExcelType.XSSF); clauseSheet.put(NormalExcelConstants.PARAMS, exportParamss); clauseSheet.put(NormalExcelConstants.DATA_LIST, lawsHomeAdvancedSearchClauseExcelVOS);