From 469186e7388dda2e9b349055f7c61a3ac08ba429 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 13 Sep 2024 16:57:02 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20scc=E6=B5=81=E7=A8=8B=E6=9C=AA=E5=88=86?=
 =?UTF-8?q?=E5=8F=91=E5=AF=BC=E5=87=BA=E6=94=AF=E6=8C=81=E2=80=9C=E8=BE=85?=
 =?UTF-8?q?=E5=8A=A9=E8=AF=B4=E6=98=8E=E6=9D=90=E6=96=99=20=E2=80=9D=20?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessStandardComplianceCheckDetail.java | 12 +++++++++++
 .../vo/WithoutDistributeExcelTemplate.java    | 20 ++++++++-----------
 ...essStandardComplianceCheckServiceImpl.java |  8 ++++++++
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java
index 44f502c1..f837d482 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java
@@ -246,6 +246,18 @@ public class ProcessStandardComplianceCheckDetail implements Serializable, Compa
         return material != null ? Arrays.asList(material.split(",")) : Collections.emptyList();
     }
 
+    /**
+     * 附件
+     */
+    @ApiModelProperty(value = "辅助说明材料")
+    @ExcelCollection(name = "", orderNum = "17")
+    @TableField(exist = false)
+    private List<ExcelExportUtilPro.FileDetails> fileListTwo = Collections.emptyList();
+
+    public List<String> obtainFileTwoIds() {
+        return unsatisfiedRequireAttach != null ? Arrays.asList(unsatisfiedRequireAttach.split(",")) : Collections.emptyList();
+    }
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/vo/WithoutDistributeExcelTemplate.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/vo/WithoutDistributeExcelTemplate.java
index e02f4a2f..ded8b546 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/vo/WithoutDistributeExcelTemplate.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/vo/WithoutDistributeExcelTemplate.java
@@ -119,14 +119,6 @@ public class WithoutDistributeExcelTemplate {
     @Excel(name = "备注", width = 15, orderNum = "13")
     private String remark;
 
-    /**
-     * 附件
-     */
-//    @ApiModelProperty(value = "佐证材料")
-//    @ExcelCollection(name = "", orderNum = "14")
-//    @TableField(exist = false)
-//    private List<ExcelExportUtilPro.FileDetails> fileList = Collections.emptyList();
-
     /**
      * 佐证材料
      */
@@ -135,11 +127,15 @@ public class WithoutDistributeExcelTemplate {
     @Dict(dictTable = "oss_file", dicCode = "id", dicText = "file_name")
     private String material;
 
-    private String sort;
+    /**
+     * 佐证材料
+     */
+    @ApiModelProperty(value = "辅助说明材料")
+    @Excel(name = "辅助说明材料", width = 15, orderNum = "14")
+    @Dict(dictTable = "oss_file", dicCode = "id", dicText = "file_name")
+    private String unsatisfiedRequireAttach;
 
-//    public List<String> obtainFileIds() {
-//        return material != null ? Arrays.asList(material.split(",")) : Collections.emptyList();
-//    }
+    private String sort;
 
 
 }
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 6bebb991..9afcc750 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
@@ -627,6 +627,10 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
             excelExportUtilPro.settleDocuments(url, "佐证材料", detailInfoList,
                     ProcessStandardComplianceCheckDetail::obtainFileIds,
                     ProcessStandardComplianceCheckDetail::setFileList);
+            // 获取数据
+            excelExportUtilPro.settleDocuments(url, "辅助说明材料", detailInfoList,
+                    ProcessStandardComplianceCheckDetail::obtainFileTwoIds,
+                    ProcessStandardComplianceCheckDetail::setFileListTwo);
 
             // 去除文本的<p>
             String regex = "<[^>]*>";
@@ -650,6 +654,10 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
                 if (StrUtil.isNotBlank(material)) {
                     item.setMaterial("佐证材料/" + material);
                 }
+                String unsatisfiedRequireAttach = excelUtils.translateDictValue("id", "file_name", "oss_file", item.getUnsatisfiedRequireAttach(), listDict);
+                if (StrUtil.isNotBlank(unsatisfiedRequireAttach)) {
+                    item.setUnsatisfiedRequireAttach("辅助说明材料/" + unsatisfiedRequireAttach);
+                }
             });
             Workbook workbook = ExcelExportUtil
                     .exportExcel(exportParams, WithoutDistributeExcelTemplate.class, data);