Excel支持设置导出类型&更换样式

2019-08-04 09:43:25 +08:00
parent e944409f5e
commit 174ed02058
11 changed files with 134 additions and 56 deletions
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
@ -4,6 +4,7 @@ import javax.validation.constraints.*;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.Excel.ColumnType;
 import com.ruoyi.common.core.domain.BaseEntity;

 /**
@ -16,7 +17,7 @@ public class SysConfig extends BaseEntity
    private static final long serialVersionUID = 1L;

    /** 参数主键 */
-    @Excel(name = "参数主键")
+    @Excel(name = "参数主键", cellType = ColumnType.NUMERIC)
    private Long configId;

    /** 参数名称 */
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictData.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictData.java
@ -4,6 +4,7 @@ import javax.validation.constraints.*;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.Excel.ColumnType;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.BaseEntity;

@ -17,11 +18,11 @@ public class SysDictData extends BaseEntity
    private static final long serialVersionUID = 1L;

    /** 字典编码 */
-    @Excel(name = "字典编码")
+    @Excel(name = "字典编码", cellType = ColumnType.NUMERIC)
    private Long dictCode;

    /** 字典排序 */
-    @Excel(name = "字典排序")
+    @Excel(name = "字典排序", cellType = ColumnType.NUMERIC)
    private Long dictSort;

    /** 字典标签 */
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictType.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictType.java
@ -4,6 +4,7 @@ import javax.validation.constraints.*;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.Excel.ColumnType;
 import com.ruoyi.common.core.domain.BaseEntity;

 /**
@ -16,7 +17,7 @@ public class SysDictType extends BaseEntity
    private static final long serialVersionUID = 1L;

    /** 字典主键 */
-    @Excel(name = "字典主键")
+    @Excel(name = "字典主键", cellType = ColumnType.NUMERIC)
    private Long dictId;

    /** 字典名称 */
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
@ -4,6 +4,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import java.util.Date;
 import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.Excel.ColumnType;
 import com.ruoyi.common.core.domain.BaseEntity;

 /**
@ -14,39 +15,39 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class SysLogininfor extends BaseEntity
 {
    private static final long serialVersionUID = 1L;
-    
+
    /** ID */
-    @Excel(name = "序号")
+    @Excel(name = "序号", cellType = ColumnType.NUMERIC)
    private Long infoId;
-    
+
    /** 用户账号 */
    @Excel(name = "用户账号")
    private String loginName;
-    
+
    /** 登录状态 0成功 1失败 */
    @Excel(name = "登录状态", readConverterExp = "0=成功,1=失败")
    private String status;
-    
+
    /** 登录IP地址 */
    @Excel(name = "登录地址")
    private String ipaddr;
-    
+
    /** 登录地点 */
    @Excel(name = "登录地点")
    private String loginLocation;
-    
+
    /** 浏览器类型 */
    @Excel(name = "浏览器")
    private String browser;
-    
+
    /** 操作系统 */
    @Excel(name = "操作系统 ")
    private String os;
-    
+
    /** 提示消息 */
    @Excel(name = "提示消息")
    private String msg;
-    
+
    /** 访问时间 */
    @Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date loginTime;
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java
@ -4,6 +4,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import java.util.Date;
 import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.Excel.ColumnType;
 import com.ruoyi.common.core.domain.BaseEntity;

 /**
@ -16,7 +17,7 @@ public class SysOperLog extends BaseEntity
    private static final long serialVersionUID = 1L;

    /** 日志主键 */
-    @Excel(name = "操作序号")
+    @Excel(name = "操作序号", cellType = ColumnType.NUMERIC)
    private Long operId;

    /** 操作模块 */
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
@ -4,6 +4,7 @@ import javax.validation.constraints.*;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.Excel.ColumnType;
 import com.ruoyi.common.core.domain.BaseEntity;

 /**
@ -16,7 +17,7 @@ public class SysPost extends BaseEntity
    private static final long serialVersionUID = 1L;

    /** 岗位序号 */
-    @Excel(name = "岗位序号")
+    @Excel(name = "岗位序号", cellType = ColumnType.NUMERIC)
    private Long postId;

    /** 岗位编码 */
@ -28,7 +29,7 @@ public class SysPost extends BaseEntity
    private String postName;

    /** 岗位排序 */
-    @Excel(name = "岗位排序")
+    @Excel(name = "岗位排序", cellType = ColumnType.NUMERIC)
    private String postSort;

    /** 状态（0正常 1停用） */
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRole.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRole.java
@ -4,6 +4,7 @@ import javax.validation.constraints.*;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.Excel.ColumnType;
 import com.ruoyi.common.core.domain.BaseEntity;

 /**
@ -16,7 +17,7 @@ public class SysRole extends BaseEntity
    private static final long serialVersionUID = 1L;

    /** 角色ID */
-    @Excel(name = "角色序号")
+    @Excel(name = "角色序号", cellType = ColumnType.NUMERIC)
    private Long roleId;

    /** 角色名称 */
@ -28,7 +29,7 @@ public class SysRole extends BaseEntity
    private String roleKey;

    /** 角色排序 */
-    @Excel(name = "角色排序")
+    @Excel(name = "角色排序", cellType = ColumnType.NUMERIC)
    private String roleSort;

    /** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限） */
@ -156,7 +157,6 @@ public class SysRole extends BaseEntity
        this.deptIds = deptIds;
    }

-    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("roleId", getRoleId())
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java
@ -6,6 +6,7 @@ import javax.validation.constraints.*;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.Excel.ColumnType;
 import com.ruoyi.common.annotation.Excel.Type;
 import com.ruoyi.common.annotation.Excels;
 import com.ruoyi.common.core.domain.BaseEntity;
@ -20,7 +21,7 @@ public class SysUser extends BaseEntity
    private static final long serialVersionUID = 1L;

    /** 用户ID */
-    @Excel(name = "用户序号", prompt = "用户编号")
+    @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
    private Long userId;

    /** 部门ID */