From d664514686fdba55b98cd785d9bc0183633f1c60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Thu, 19 Sep 2024 14:41:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=B0=86/=E6=9B=BF=E6=8D=A2=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../home/service/impl/LawsHomeSearchServiceImpl.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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<String, Object> parameterMap) {
         List<LawsHomeAdvancedSearchClauseVO> advancedSearchClause = getAdvancedSearchClauseExport(parameterMap);
-        List<Map<String, Object>> list = new ArrayList<>();
+        List<Map<String, Object>> list = new CopyOnWriteArrayList<>();
 
         // 标准sheet页
         List<LawsHomeAdvancedSearchStandardExcelVO> 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<Map<String, Object>> clauseList = lawsHomeAdvancedSearchClauseVO.getClauseList();
             List<LawsHomeAdvancedSearchClauseExcelVO> lawsHomeAdvancedSearchClauseExcelVOS =
                     JSON.parseArray(JSON.toJSONString(clauseList), LawsHomeAdvancedSearchClauseExcelVO.class);
             // 条款详情
-            for (LawsHomeAdvancedSearchClauseExcelVO lawsHomeAdvancedSearchClauseExcelVO :
-                    lawsHomeAdvancedSearchClauseExcelVOS) {
+            lawsHomeAdvancedSearchClauseExcelVOS.parallelStream().forEach(lawsHomeAdvancedSearchClauseExcelVO->{
                 List<SarFileSplitItemsValEO> sarFileSplitItemsValEOS = sarFileSplitItemsValEOMapper.findList(
                         new QueryWrapper<SarFileSplitItemsValEO>()
                                 .eq("item_id", lawsHomeAdvancedSearchClauseExcelVO.getId())
@@ -1393,11 +1392,12 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
                             .collect(Collectors.joining("\n\r"));
                     lawsHomeAdvancedSearchClauseExcelVO.setItemContent(itemContents);
                 }
-            }
+            });
+
             // 条款sheet页
             Map<String, Object> 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);