From d7d27cfab47f55b254f0fd9a361f312551b53b25 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期三, 05 四月 2023 18:14:59 +0800
Subject: [PATCH] 添加新群号：101046199
---
src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
index e6f069c..0fff225 100644
--- a/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
+++ b/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
@@ -99,6 +99,11 @@
public static final String[] FORMULA_STR = { "=", "-", "+", "@" };
/**
+ * 鐢ㄤ簬dictType灞炴�ф暟鎹瓨鍌紝閬垮厤閲嶅鏌ョ紦瀛�
+ */
+ public Map<String, String> sysDictMap = new HashMap<String, String>();
+
+ /**
* Excel sheet鏈�澶ц鏁帮紝榛樿65536
*/
public static final int sheetSize = 65536;
@@ -1034,7 +1039,12 @@
}
else if (StringUtils.isNotEmpty(dictType) && StringUtils.isNotNull(value))
{
- cell.setCellValue(convertDictByExp(Convert.toStr(value), dictType, separator));
+ if (!sysDictMap.containsKey(dictType + value))
+ {
+ String lable = convertDictByExp(Convert.toStr(value), dictType, separator);
+ sysDictMap.put(dictType + value, lable);
+ }
+ cell.setCellValue(sysDictMap.get(dictType + value));
}
else if (value instanceof BigDecimal && -1 != attr.scale())
{
@@ -1321,7 +1331,7 @@
*/
public String encodingFilename(String filename)
{
- filename = UUID.randomUUID().toString() + "_" + filename + ".xlsx";
+ filename = UUID.randomUUID() + "_" + filename + ".xlsx";
return filename;
}
@@ -1440,7 +1450,8 @@
Excel[] excels = attrs.value();
for (Excel attr : excels)
{
- if (attr != null && (attr.type() == Type.ALL || attr.type() == type))
+ if (!ArrayUtils.contains(this.excludeFields, field.getName() + "." + attr.targetAttr())
+ && (attr != null && (attr.type() == Type.ALL || attr.type() == type)))
{
field.setAccessible(true);
fields.add(new Object[] { field, attr });
@@ -1598,7 +1609,7 @@
HSSFPicture pic = (HSSFPicture) shape;
int pictureIndex = pic.getPictureIndex() - 1;
HSSFPictureData picData = pictures.get(pictureIndex);
- String picIndex = String.valueOf(anchor.getRow1()) + "_" + String.valueOf(anchor.getCol1());
+ String picIndex = anchor.getRow1() + "_" + anchor.getCol1();
sheetIndexPicMap.put(picIndex, picData);
}
}
--
Gitblit v1.9.3