From cdadaece572aa81f562644c6d3c7454188586158 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 18 Jul 2024 19:10:37 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20scc=E6=B5=81=E7=A8=8B=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessStandardComplianceCheckController.java   | 13 +++++++++----
 .../ProcessStandardComplianceCheckServiceImpl.java  |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java
index b788c68e..4d282e85 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java
@@ -5,6 +5,7 @@ import com.jero.common.api.vo.ResultCommon;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.aspect.annotation.DictPoint;
 import com.jero.common.aspect.annotation.Translation;
+import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.util.MessageUtils;
 import com.jero.modules.activiti.enums.ProcessTypeEnum;
@@ -188,10 +189,14 @@ public class ProcessStandardComplianceCheckController extends JeroController<Pro
     @ApiOperation(value="法规符合性排查流程-导入", notes="法规符合性排查流程-导入")
     @PostMapping("/importExcelWithData")
     public Result<?> importExcelWithData(@RequestParam("file") @ApiParam("文件") MultipartFile file) {
-        List<String> errorMessages = sccService.importExcelWithData(file);
-        if (!errorMessages.isEmpty()) {
-            return Result.error(MessageUtils.getMessage(ResultCommon.IMPORT_ERROR), errorMessages);
+        Map<String, Object> resultMap = sccService.importExcelWithData(file);
+        Object flag = resultMap.get("flag");
+        if (flag == YesOrNoEnum.YES.getValue()) {
+            List<ProcessStandardComplianceCheckDetail> dataList = (List<ProcessStandardComplianceCheckDetail>) resultMap.get("dataList");
+            return Result.OK(dataList);
+        } else {
+            List<String> msg = (List<String>) resultMap.get("msg");
+            return Result.error(MessageUtils.getMessage(ResultCommon.IMPORT_ERROR), msg);
         }
-        return Result.OK();
     }
 }
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 656c3e5e..cd8d8db0 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
@@ -474,7 +474,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
     }
 
     @Override
-    public List<String> importExcelWithData(MultipartFile file) {
+    public Map<String, Object> importExcelWithData(MultipartFile file) {
         return null;
     }