From e73dbd470ab6ff6482d0248fcf79d633e2ea8dc0 Mon Sep 17 00:00:00 2001 From: RuoYi <yzz_ivy@163.com> Date: 星期日, 07 八月 2022 18:33:04 +0800 Subject: [PATCH] Excel注解支持导出对象的子列表方法 --- ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java | 23 ++++++----------------- 1 files changed, 6 insertions(+), 17 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java index 804db72..c6c8bc5 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java @@ -89,6 +89,11 @@ public String[] combo() default {}; /** + * 是否需要纵向合并单元格,应对需求:含有list集合单元格) + */ + public boolean needMerge() default false; + + /** * 是否导出数据,应对需求:有时我们需要导出一份模板,这是标题需要但内容需要用户手工填写. */ public boolean isExport() default true; @@ -104,7 +109,7 @@ public boolean isStatistics() default false; /** - * 导出类型(0数字 1字符串) + * 导出类型(0数字 1字符串 2图片) */ public ColumnType cellType() default ColumnType.STRING; @@ -142,22 +147,6 @@ * 自定义数据处理器参数 */ public String[] args() default {}; - - public enum Align - { - AUTO(0), LEFT(1), CENTER(2), RIGHT(3); - private final int value; - - Align(int value) - { - this.value = value; - } - - public int value() - { - return this.value; - } - } /** * 字段类型(0:导出导入;1:仅导出;2:仅导入) -- Gitblit v1.9.2