Commit 1323c4e8 authored by 施翔轲's avatar 施翔轲

修改用户管理导出模板

parent 407c50e4
...@@ -5,10 +5,9 @@ import com.dsk.common.annotation.Sensitive; ...@@ -5,10 +5,9 @@ import com.dsk.common.annotation.Sensitive;
import com.dsk.common.constant.UserConstants; import com.dsk.common.constant.UserConstants;
import com.dsk.common.enums.SensitiveStrategy; import com.dsk.common.enums.SensitiveStrategy;
import com.dsk.common.tenant.core.TenantEntity; import com.dsk.common.tenant.core.TenantEntity;
import com.dsk.common.xss.Xss;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.dsk.common.core.domain.BaseEntity;
import com.dsk.common.xss.Xss;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
...@@ -129,6 +128,11 @@ public class SysUser extends TenantEntity { ...@@ -129,6 +128,11 @@ public class SysUser extends TenantEntity {
*/ */
private String remark; private String remark;
/**
* 创建时间
*/
private Date createTime;
/** /**
* 部门对象 * 部门对象
*/ */
...@@ -159,6 +163,7 @@ public class SysUser extends TenantEntity { ...@@ -159,6 +163,7 @@ public class SysUser extends TenantEntity {
@TableField(exist = false) @TableField(exist = false)
private Long roleId; private Long roleId;
public SysUser(Long userId) { public SysUser(Long userId) {
this.userId = userId; this.userId = userId;
} }
......
package com.dsk.system.domain.vo; package com.dsk.system.domain.vo;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.dsk.common.annotation.ExcelDictFormat; import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.dsk.common.convert.ExcelDictConvert;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
...@@ -20,29 +19,29 @@ import java.util.Date; ...@@ -20,29 +19,29 @@ import java.util.Date;
public class SysUserExportVo implements Serializable { public class SysUserExportVo implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** ///**
* 用户ID // * 用户ID
*/ // */
@ExcelProperty(value = "用户序号") //@ExcelProperty(value = "用户序号")
private Long userId; //private Long userId;
//
/** ///**
* 用户账号 // * 用户账号
*/ // */
@ExcelProperty(value = "登录名称") //@ExcelProperty(value = "登录名称")
private String userName; //private String userName;
/** /**
* 用户昵称 * 用户昵称
*/ */
@ExcelProperty(value = "用户称") @ExcelProperty(value = "用户称")
private String nickName; private String nickName;
/** ///**
* 用户邮箱 // * 用户邮箱
*/ // */
@ExcelProperty(value = "用户邮箱") //@ExcelProperty(value = "用户邮箱")
private String email; //private String email;
/** /**
* 手机号码 * 手机号码
...@@ -50,42 +49,50 @@ public class SysUserExportVo implements Serializable { ...@@ -50,42 +49,50 @@ public class SysUserExportVo implements Serializable {
@ExcelProperty(value = "手机号码") @ExcelProperty(value = "手机号码")
private String phonenumber; private String phonenumber;
/** ///**
* 用户性别 // * 用户性别
*/ // */
@ExcelProperty(value = "用户性别", converter = ExcelDictConvert.class) //@ExcelProperty(value = "用户性别", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_user_sex") //@ExcelDictFormat(dictType = "sys_user_sex")
private String sex; //private String sex;
//
/** ///**
* 帐号状态(0正常 1停用) // * 帐号状态(0正常 1停用)
*/ // */
@ExcelProperty(value = "帐号状态", converter = ExcelDictConvert.class) //@ExcelProperty(value = "帐号状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_normal_disable") //@ExcelDictFormat(dictType = "sys_normal_disable")
private String status; //private String status;
//
/** ///**
* 最后登录IP // * 最后登录IP
*/ // */
@ExcelProperty(value = "最后登录IP") //@ExcelProperty(value = "最后登录IP")
private String loginIp; //private String loginIp;
//
/** ///**
* 最后登录时间 // * 最后登录时间
*/ // */
@ExcelProperty(value = "最后登录时间") //@ExcelProperty(value = "最后登录时间")
private Date loginDate; //private Date loginDate;
/** /**
* 部门名称 * 部门名称
*/ */
@ExcelProperty(value = "部门名称") @ExcelProperty(value = "组织名称")
private String deptName; private String deptName;
///**
// * 负责人
// */
//@ExcelProperty(value = "部门负责人")
//private String leader;
/** /**
* 负责人 * 创建时间
*/ */
@ExcelProperty(value = "部门负责人") @ExcelProperty(value = "创建时间")
private String leader; @ColumnWidth(value = 25) // 列宽
private Date createTime;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment