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 a57529b76..ed55b3813 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 @@ -53,6 +53,11 @@ public @interface Excel */ public int scale() default -1; + /** + * index 下标 默认:-1(默认不开启下标) + */ + public int index() default -1; + /** * BigDecimal 舍入规则 默认:BigDecimal.ROUND_HALF_EVEN */ diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index 4aa1d2b2d..1756f01e7 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java @@ -24,7 +24,7 @@ public class SysUser extends BaseEntity private static final long serialVersionUID = 1L; /** 用户ID */ - @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号") + @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号", index = 0) private Long userId; /** 部门ID */ 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 4fc3ff4fc..4e5075cdb 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 @@ -284,6 +284,8 @@ public class ExcelUtil if (column != null) { fieldsMap.put(column, objects); + } else if(attr.index != -1){ + fieldsMap.put(attr.index, objects); } } for (int i = titleNum + 1; i <= rows; i++)