From fea9fdaa5f4d0e2c49cb86b2e48a2b8f9234a8e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Fri, 28 Jul 2023 20:08:53 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20excel=20=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=AD=97=E5=85=B8=E9=BB=98=E8=AE=A4=E8=BD=AC=E4=B8=BA?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/common/core/domain/entity/SysDictData.java | 4 ++-- .../com/ruoyi/common/core/domain/entity/SysDictType.java | 2 +- .../java/com/ruoyi/common/core/domain/entity/SysRole.java | 4 ++-- .../main/java/com/ruoyi/common/excel/ExcelDownHandler.java | 3 +++ .../src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 6 ++---- .../src/main/java/com/ruoyi/system/domain/SysConfig.java | 2 +- .../main/java/com/ruoyi/system/domain/SysLogininfor.java | 2 +- .../src/main/java/com/ruoyi/system/domain/SysOperLog.java | 6 +++--- .../src/main/java/com/ruoyi/system/domain/SysPost.java | 2 +- .../java/com/ruoyi/system/domain/vo/SysUserExportVo.java | 4 ++-- 10 files changed, 18 insertions(+), 17 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java index 4ed2c5483..373be368d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java @@ -77,14 +77,14 @@ public class SysDictData extends BaseEntity { /** * 是否默认（Y是 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-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java index 76c20e102..d16c3a20d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java @@ -53,7 +53,7 @@ public class SysDictType extends BaseEntity { /** * 状态（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-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java index 594956998..99edf328e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java @@ -64,7 +64,7 @@ public class SysRole extends BaseEntity { /** * 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限） */ - @ExcelProperty(value = "数据范围", converter = ExcelDictConvert.class) + @ExcelProperty(value = "数据范围", index = 4, converter = ExcelDictConvert.class) @ExcelDictFormat(readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限,5=仅本人数据权限") private String dataScope; @@ -81,7 +81,7 @@ public class SysRole extends BaseEntity { /** * 角色状态（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-common/src/main/java/com/ruoyi/common/excel/ExcelDownHandler.java b/ruoyi-common/src/main/java/com/ruoyi/common/excel/ExcelDownHandler.java index 442e353dd..554e2fef5 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/excel/ExcelDownHandler.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/excel/ExcelDownHandler.java @@ -128,6 +128,9 @@ public class ExcelDownHandler implements SheetWriteHandler { } } } + if (CollUtil.isEmpty(dropDownOptions)) { + return; + } dropDownOptions.forEach(everyOptions -> { // 如果传递了下拉框选择器参数 if (!everyOptions.getNextOptions().isEmpty()) { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java index 8459e1478..78cf0e72d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java @@ -196,10 +196,8 @@ public class ExcelUtil { // 合并处理器 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-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java index ca9a77ce3..4fe1001b2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java @@ -59,7 +59,7 @@ public class SysConfig extends BaseEntity { /** * 系统内置（Y是 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-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java index f95b332e7..ec2c72e41 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java @@ -42,7 +42,7 @@ public class SysLogininfor implements Serializable { /** * 登录状态 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-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java index 84af07b91..221033f8a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java @@ -43,7 +43,7 @@ public class SysOperLog implements Serializable { /** * 业务类型（0其它 1新增 2修改 3删除） */ - @ExcelProperty(value = "业务类型", converter = ExcelDictConvert.class) + @ExcelProperty(value = "业务类型", index = 2, converter = ExcelDictConvert.class) @ExcelDictFormat(dictType = "sys_oper_type") private Integer businessType; @@ -68,7 +68,7 @@ public class SysOperLog implements Serializable { /** * 操作类别（0其它 1后台用户 2手机端用户） */ - @ExcelProperty(value = "操作类别", converter = ExcelDictConvert.class) + @ExcelProperty(value = "操作类别", index = 5, converter = ExcelDictConvert.class) @ExcelDictFormat(readConverterExp = "0=其它,1=后台用户,2=手机端用户") private Integer operatorType; @@ -117,7 +117,7 @@ public class SysOperLog implements Serializable { /** * 操作状态（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-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java index ecb84f4b4..3484616e0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java @@ -60,7 +60,7 @@ public class SysPost extends BaseEntity { /** * 状态（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-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java index a50283d28..b2d299919 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java @@ -53,14 +53,14 @@ public class SysUserExportVo implements Serializable { /** * 用户性别 */ - @ExcelProperty(value = "用户性别", converter = ExcelDictConvert.class) + @ExcelProperty(value = "用户性别", index = 5, converter = ExcelDictConvert.class) @ExcelDictFormat(dictType = "sys_user_sex") private String sex; /** * 帐号状态（0正常 1停用） */ - @ExcelProperty(value = "帐号状态", converter = ExcelDictConvert.class) + @ExcelProperty(value = "帐号状态", index = 6, converter = ExcelDictConvert.class) @ExcelDictFormat(dictType = "sys_normal_disable") private String status;