diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java index 1257c9c..f3538cf 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java @@ -169,6 +169,16 @@ public class SysUser extends BaseEntity { /**是否内置,0内置,1非内置*/ private String isBuiltIn = "1"; + /** 临时用户生效开始日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "生效开始日期", width = 30, dateFormat = "yyyy-MM-dd") + private String effectiveStartDay; + + /** 临时用户生效截止日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "生效截止日期", width = 30, dateFormat = "yyyy-MM-dd") + private String effectiveEndDay; + public SysUser() { } @@ -428,4 +438,20 @@ public class SysUser extends BaseEntity { public void setIsBuiltIn(String isBuiltIn) { this.isBuiltIn = isBuiltIn; } + + public String getEffectiveStartDay() { + return effectiveStartDay; + } + + public void setEffectiveStartDay(String effectiveStartDay) { + this.effectiveStartDay = effectiveStartDay; + } + + public String getEffectiveEndDay() { + return effectiveEndDay; + } + + public void setEffectiveEndDay(String effectiveEndDay) { + this.effectiveEndDay = effectiveEndDay; + } } diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml index f659fc9..fb4e65a 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -31,6 +31,8 @@ + + @@ -97,7 +99,9 @@ r.data_scope, r.status as role_status, u.login_type, - u.is_built_in + u.is_built_in, + u.effective_start_day, + u.effective_end_day from sys_user u left join sys_dept d on u.dept_id = d.dept_id left join sys_user_role ur on u.user_id = ur.user_id @@ -106,14 +110,15 @@