From 1cabccc9a8486cef1d0965931ee5918770522895 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 28 七月 2023 20:00:58 +0800
Subject: [PATCH] update 优化 excel 导出字典默认转为下拉框
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java | 2 +-
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java | 2 +-
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java | 2 +-
ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java | 3 +++
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java | 2 +-
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java | 2 +-
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java | 2 +-
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java | 6 +++---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java | 4 ++--
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java | 4 ++--
ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java | 6 ++----
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java | 4 ++--
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java | 2 +-
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java | 2 +-
14 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java
index 52bfebc..db4fecc 100644
--- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java
+++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java
@@ -128,6 +128,9 @@
}
}
}
+ if (CollUtil.isEmpty(dropDownOptions)) {
+ return;
+ }
dropDownOptions.forEach(everyOptions -> {
// 濡傛灉浼犻�掍簡涓嬫媺妗嗛�夋嫨鍣ㄥ弬鏁�
if (!everyOptions.getNextOptions().isEmpty()) {
diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java
index 00a78ea..329911d 100644
--- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java
+++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java
@@ -196,10 +196,8 @@
// 鍚堝苟澶勭悊鍣�
builder.registerWriteHandler(new CellMergeStrategy(list, true));
}
- if (CollUtil.isNotEmpty(options)) {
- // 娣诲姞涓嬫媺妗嗘搷浣�
- builder.registerWriteHandler(new ExcelDownHandler(options));
- }
+ // 娣诲姞涓嬫媺妗嗘搷浣�
+ builder.registerWriteHandler(new ExcelDownHandler(options));
builder.doWrite(list);
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java
index 34f24eb..fa23cd1 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java
@@ -82,7 +82,7 @@
/**
* 鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
*/
- @ExcelProperty(value = "鐘舵��", converter = ExcelDictConvert.class)
+ @ExcelProperty(value = "鐘舵��", index = 7, converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0=姝ｅ父,1=鍋滅敤")
private String status;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java
index f896000..db7d53a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java
@@ -53,7 +53,7 @@
/**
* 绯荤粺鍐呯疆锛圷鏄� N鍚︼級
*/
- @ExcelProperty(value = "绯荤粺鍐呯疆", converter = ExcelDictConvert.class)
+ @ExcelProperty(value = "绯荤粺鍐呯疆", index = 4, converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_yes_no")
private String configType;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java
index e09d67e..4611ae0 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java
@@ -78,7 +78,7 @@
/**
* 閮ㄩ棬鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
*/
- @ExcelProperty(value = "閮ㄩ棬鐘舵��", converter = ExcelDictConvert.class)
+ @ExcelProperty(value = "閮ㄩ棬鐘舵��", index = 5, converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_normal_disable")
private String status;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java
index d058d5e..1372f31 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java
@@ -69,14 +69,14 @@
/**
* 鏄惁榛樿锛圷鏄� N鍚︼級
*/
- @ExcelProperty(value = "鏄惁榛樿", converter = ExcelDictConvert.class)
+ @ExcelProperty(value = "鏄惁榛樿", index = 5, converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_yes_no")
private String isDefault;
/**
* 鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
*/
- @ExcelProperty(value = "鐘舵��", converter = ExcelDictConvert.class)
+ @ExcelProperty(value = "鐘舵��", index = 6, converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_normal_disable")
private String status;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java
index 2cac4a2..771f956 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java
@@ -47,7 +47,7 @@
/**
* 鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
*/
- @ExcelProperty(value = "鐘舵��", converter = ExcelDictConvert.class)
+ @ExcelProperty(value = "鐘舵��", index = 3, converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_normal_disable")
private String status;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java
index cf9720e..97bc79b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java
@@ -48,7 +48,7 @@
/**
* 鐧诲綍鐘舵�侊紙0鎴愬姛 1澶辫触锛�
*/
- @ExcelProperty(value = "鐧诲綍鐘舵��", converter = ExcelDictConvert.class)
+ @ExcelProperty(value = "鐧诲綍鐘舵��", index = 2, converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_common_status")
private String status;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java
index d9eb71d..306237e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java
@@ -47,7 +47,7 @@
/**
* 涓氬姟绫诲瀷锛�0鍏跺畠 1鏂板 2淇敼 3鍒犻櫎锛�
*/
- @ExcelProperty(value = "涓氬姟绫诲瀷", converter = ExcelDictConvert.class)
+ @ExcelProperty(value = "涓氬姟绫诲瀷", index = 2, converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_oper_type")
private Integer businessType;
@@ -71,7 +71,7 @@
/**
* 鎿嶄綔绫诲埆锛�0鍏跺畠 1鍚庡彴鐢ㄦ埛 2鎵嬫満绔敤鎴凤級
*/
- @ExcelProperty(value = "鎿嶄綔绫诲埆", converter = ExcelDictConvert.class)
+ @ExcelProperty(value = "鎿嶄綔绫诲埆", index = 5, converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0=鍏跺畠,1=鍚庡彴鐢ㄦ埛,2=鎵嬫満绔敤鎴�")
private Integer operatorType;
@@ -120,7 +120,7 @@
/**
* 鎿嶄綔鐘舵�侊紙0姝ｅ父 1寮傚父锛�
*/
- @ExcelProperty(value = "鐘舵��", converter = ExcelDictConvert.class)
+ @ExcelProperty(value = "鐘舵��", index = 13, converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_common_status")
private Integer status;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java
index 3e6c6a8..3185423 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java
@@ -54,7 +54,7 @@
/**
* 鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
*/
- @ExcelProperty(value = "鐘舵��", converter = ExcelDictConvert.class)
+ @ExcelProperty(value = "鐘舵��", index = 4, converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_normal_disable")
private String status;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java
index 1e5cd9e..015a043 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java
@@ -53,7 +53,7 @@
/**
* 鏁版嵁鑼冨洿锛�1锛氬叏閮ㄦ暟鎹潈闄� 2锛氳嚜瀹氭暟鎹潈闄� 3锛氭湰閮ㄩ棬鏁版嵁鏉冮檺 4锛氭湰閮ㄩ棬鍙婁互涓嬫暟鎹潈闄愶級
*/
- @ExcelProperty(value = "鏁版嵁鑼冨洿", converter = ExcelDictConvert.class)
+ @ExcelProperty(value = "鏁版嵁鑼冨洿", index = 4, converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "1=鎵�鏈夋暟鎹潈闄�,2=鑷畾涔夋暟鎹潈闄�,3=鏈儴闂ㄦ暟鎹潈闄�,4=鏈儴闂ㄥ強浠ヤ笅鏁版嵁鏉冮檺,5=浠呮湰浜烘暟鎹潈闄�")
private String dataScope;
@@ -72,7 +72,7 @@
/**
* 瑙掕壊鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
*/
- @ExcelProperty(value = "瑙掕壊鐘舵��", converter = ExcelDictConvert.class)
+ @ExcelProperty(value = "瑙掕壊鐘舵��", index = 7, converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_normal_disable")
private String status;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java
index 070334b..ae11a82 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java
@@ -58,7 +58,7 @@
/**
* 鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
*/
- @ExcelProperty(value = "鐘舵��", converter = ExcelDictConvert.class)
+ @ExcelProperty(value = "鐘舵��", index = 5, converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0=姝ｅ父,1=鍋滅敤")
private String status;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java
index 6a45315..49e03ea 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java
@@ -107,7 +107,7 @@
/**
* 绉熸埛鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
*/
- @ExcelProperty(value = "绉熸埛鐘舵��", converter = ExcelDictConvert.class)
+ @ExcelProperty(value = "绉熸埛鐘舵��", index = 13, converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0=姝ｅ父,1=鍋滅敤")
private String status;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java
index 21b1efb..b7fc480 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java
@@ -59,14 +59,14 @@
/**
* 鐢ㄦ埛鎬у埆
*/
- @ExcelProperty(value = "鐢ㄦ埛鎬у埆", converter = ExcelDictConvert.class)
+ @ExcelProperty(value = "鐢ㄦ埛鎬у埆", index = 6, converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_user_sex")
private String sex;
/**
* 甯愬彿鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
*/
- @ExcelProperty(value = "甯愬彿鐘舵��", converter = ExcelDictConvert.class)
+ @ExcelProperty(value = "甯愬彿鐘舵��", index = 7, converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_normal_disable")
private String status;
--
Gitblit v1.9.3