From 15bd09d472ede8b7a349b1e35822a07085770c38 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 8 Aug 2024 19:36:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2087915=20=E6=B3=95=E8=A7=84=E7=AC=A6?=
 =?UTF-8?q?=E5=90=88=E6=80=A7=E6=8E=92=E6=9F=A5=E6=B5=81=E7=A8=8B=EF=BC=88?=
 =?UTF-8?q?=E4=B8=BB=E6=8E=92=E6=9F=A5=E4=BA=BA=E5=88=86=E6=89=B9=E4=B8=8B?=
 =?UTF-8?q?=E5=8F=91=EF=BC=89=20--=E4=B8=8D=E5=88=86=E5=8F=91--=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E7=9A=84=E6=9D=A1=E6=AC=BE=E5=86=85=E5=AE=B9=E6=9C=89?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessStandardComplianceCheckServiceImpl.java   | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
index a6a59d36..11887ea2 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
@@ -494,9 +494,10 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
             ExportParams exportParams = new ExportParams();
             exportParams.setType(ExcelType.HSSF);
             // 去除文本的<p>
+            String regex = "<[^>]*>";
             detailInfoList.forEach(detail -> {
                 if (StrUtil.isNotBlank(detail.getTermContent())) {
-                    detail.setTermContent(detail.getTermContent().replaceAll("<p>", ""));
+                    detail.setTermContent(detail.getTermContent().replaceAll(regex, ""));
                 }
             });
             // 复制一份数据
@@ -542,9 +543,10 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
                     ProcessStandardComplianceCheckDetail::setFileList);
 
             // 去除文本的<p>
+            String regex = "<[^>]*>";
             detailInfoList.forEach(detail -> {
                 if (StrUtil.isNotBlank(detail.getTermContent())) {
-                    detail.setTermContent(detail.getTermContent().replaceAll("<p>", ""));
+                    detail.setTermContent(detail.getTermContent().replaceAll(regex, ""));
                 }
             });
 
@@ -559,14 +561,8 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
                 item.setResult(excelUtils.translateDict("evaluation_result", item.getResult(), listDict));
                 item.setMaterial(excelUtils.translateDictValue("id", "file_name", "oss_file", item.getMaterial(), listDict));
             });
-
-            List<WithoutDistributeExcelTemplate> newRecordsExport = new ArrayList<>(data);
-
             Workbook workbook = ExcelExportUtil
                     .exportExcel(exportParams, WithoutDistributeExcelTemplate.class, data);
-            // 生成超链接
-//            excelExportUtilPro.generateHyperlink(newRecordsExport, workbook,
-//                    WithoutDistributeExcelTemplate::getFileList, 13);
             // 导出excel
             workbook.write(fos);
             // 生成并导出zip