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 validationModelList(List list, List listDict) { List errorMsgs = new ArrayList<>(); - int i = 4; + int i = 2; Iterator iterator = list.iterator(); while (iterator.hasNext()) { ModelExcelVO data = iterator.next(); @@ -1099,13 +1099,20 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl", errorMsgs); + String errorMsg = "
" + String.join("
", errorMsgs); throw new JeroBootException(ResultCommon.MODEL_IMPORT_DATA_ERROR, errorMsg); + } else { + this.transToDictValue(modelExcelVOList, listDict); } + // 转换一下数据 return modelExcelVOList; } + private void transToDictValue(List list, List listDict) { + list.forEach(item -> item.setModelState(excelUtils.translateDictValue("model_status", item.getModelState(), listDict))); + } + @Override public List getDoNotDeleteStandardIdList() { List 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 "";