Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pre Merge pull request !394 from 呼叫彩虹/N/A

Browse Source
This commit is contained in:
呼叫彩虹 2022-05-01 12:24:11 +00:00 committed by Gitee
commit 9a14143c07
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java
View File

@ -53,6 +53,11 @@ public @interface Excel
*/ */
public int scale() default -1; public int scale() default -1;
/**
* index 下标 默认:-1(默认不开启下标)
*/
public int index() default -1;
/** /**
* BigDecimal 舍入规则 默认:BigDecimal.ROUND_HALF_EVEN * BigDecimal 舍入规则 默认:BigDecimal.ROUND_HALF_EVEN
*/ */

2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
View File

@ -24,7 +24,7 @@ public class SysUser extends BaseEntity
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 用户ID */ /** 用户ID */
@Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号") @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号", index = 0)
private Long userId; private Long userId;
/** 部门ID */ /** 部门ID */

2
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
View File

@ -284,6 +284,8 @@ public class ExcelUtil<T>
if (column != null) if (column != null)
{ {
fieldsMap.put(column, objects); fieldsMap.put(column, objects);
} else if(attr.index != -1){
fieldsMap.put(attr.index, objects);
} }
} }
for (int i = titleNum + 1; i <= rows; i++) for (int i = titleNum + 1; i <= rows; i++)