Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dsk-cr20g
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
dsk-cr20g
Commits
1323c4e8
Commit
1323c4e8
authored
Sep 14, 2023
by
施翔轲
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改用户管理导出模板
parent
407c50e4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
62 additions
and
50 deletions
+62
-50
SysUser.java
dsk-system/src/main/java/com/dsk/system/domain/SysUser.java
+7
-2
SysUserExportVo.java
...c/main/java/com/dsk/system/domain/vo/SysUserExportVo.java
+55
-48
No files found.
dsk-system/src/main/java/com/dsk/system/domain/SysUser.java
View file @
1323c4e8
...
@@ -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
;
}
}
...
...
dsk-system/src/main/java/com/dsk/system/domain/vo/SysUserExportVo.java
View file @
1323c4e8
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
;
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment