From 42295ef2ac0a5e78674cf24b62d6834138f0ffdc Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 29 十一月 2021 13:56:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java b/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java
index 6049b1e..7c4d631 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java
@@ -8,8 +8,10 @@
import com.alibaba.excel.metadata.GlobalConfiguration;
import com.alibaba.excel.metadata.property.ExcelContentProperty;
import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.core.service.DictService;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.poi.ExcelUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.utils.spring.SpringUtils;
import lombok.extern.slf4j.Slf4j;
import java.lang.reflect.Field;
@@ -39,9 +41,9 @@
String label = cellData.getStringValue();
String value;
if (StringUtils.isBlank(type)) {
- value = ExcelUtils.reverseByExp(label, anno.readConverterExp(), anno.separator());
+ value = ExcelUtil.reverseByExp(label, anno.readConverterExp(), anno.separator());
} else {
- value = ExcelUtils.reverseDictByExp(label, type, anno.separator());
+ value = SpringUtils.getBean(DictService.class).getDictValue(type, label, anno.separator());
}
return Convert.convert(contentProperty.getField().getType(), value);
}
@@ -56,9 +58,9 @@
String value = Convert.toStr(object);
String label;
if (StringUtils.isBlank(type)) {
- label = ExcelUtils.convertByExp(value, anno.readConverterExp(), anno.separator());
+ label = ExcelUtil.convertByExp(value, anno.readConverterExp(), anno.separator());
} else {
- label = ExcelUtils.convertDictByExp(value, type, anno.separator());
+ label = SpringUtils.getBean(DictService.class).getDictLabel(type, value, anno.separator());
}
return new CellData<>(label);
}
--
Gitblit v1.9.3