From 980f9e7ffafb275274d6bb523a602b95c0f638b9 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 1 Aug 2024 19:26:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BD=A6=E5=9E=8B=E7=94=9F=E6=88=90BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/vo/ModelExcelVO.java                       |  2 +-
 .../ProcessStandardComplianceCheckServiceImpl.java    | 11 +++++++++--
 .../com/jero/modules/activiti/util/ExcelUtils.java    |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/vo/ModelExcelVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/vo/ModelExcelVO.java
index bdeeffbf..30a7c580 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/vo/ModelExcelVO.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/vo/ModelExcelVO.java
@@ -16,7 +16,7 @@ public class ModelExcelVO {
 
 
     @Dict(dicCode = "model_status")
-    @Excel(name = "车型状态", dicCode = "model_status")
+    @Excel(name = "车型状态")
     private String modelState;
 
     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 f55367bb..88b223d1 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
@@ -678,7 +678,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
 
     private List<String> validationModelList(List<ModelExcelVO> list, List<SysDictItemCore> listDict) {
         List<String> errorMsgs = new ArrayList<>();
-        int i = 4;
+        int i = 2;
         Iterator<ModelExcelVO> iterator = list.iterator();
         while (iterator.hasNext()) {
             ModelExcelVO data = iterator.next();
@@ -1099,13 +1099,20 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
         // 批量检查数据是否有效
         errorMsgs = this.validationModelList(modelExcelVOList, listDict);
         if (!errorMsgs.isEmpty()) {
-            String errorMsg = String.join("<br>", errorMsgs);
+            String errorMsg = "<br>" + String.join("<br>", errorMsgs);
             throw new JeroBootException(ResultCommon.MODEL_IMPORT_DATA_ERROR, errorMsg);
+        } else {
+            this.transToDictValue(modelExcelVOList, listDict);
         }
+        // 转换一下数据
 
         return modelExcelVOList;
     }
 
+    private void transToDictValue(List<ModelExcelVO> list, List<SysDictItemCore> listDict) {
+        list.forEach(item -> item.setModelState(excelUtils.translateDictValue("model_status", item.getModelState(), listDict)));
+    }
+
     @Override
     public List<String> getDoNotDeleteStandardIdList() {
         List<ProcessStandardComplianceCheck> list = list();
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java b/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java
index fd646267..9f706ed2 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java
@@ -618,7 +618,7 @@ public class ExcelUtils {
             return "";
         }
         // 检查排查结果
-        if (!excelUtils.validDict("model_state", value, null, null, true, listDict)) {
+        if (!excelUtils.validDict("model_status", value, null, null, true, listDict)) {
             return "'车型状态'无效。";
         }
         return "";