From 10aaa035f5be0312304d20f022bdb714a8f4900a Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期三, 11 十二月 2024 22:16:23 +0800 Subject: [PATCH] 代码提交 --- ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 126 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 126 insertions(+), 0 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index 44bd409..02a6b6c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java @@ -1,7 +1,9 @@ package com.ruoyi.common.core.domain.entity; +import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Map; import javax.validation.constraints.*; import io.swagger.annotations.ApiModel; @@ -47,6 +49,13 @@ private String userName; /** + * 鎮h�呰寖鍥达細0:鍏ㄩ儴锛�1锛氱瀹�2锛氱梾鍖猴紱 + */ + @ApiModelProperty(value = "鎮h�呰寖鍥达細0:鍏ㄩ儴锛�1锛氱瀹�2锛氱梾鍖猴紱") + @Excel(name = "鎮h�呰寖鍥达細0:鍏ㄩ儴锛�1锛氱瀹�2锛氱梾鍖猴紱") + private String searchscope; + + /** * 鐢ㄦ埛鏄电О */ @ApiModelProperty(value = "鐢ㄦ埛鏄电О") @@ -61,11 +70,25 @@ private String email; /** + * 鐢ㄦ埛绫诲瀷锛�00绯荤粺鐢ㄦ埛锛� + */ + @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷锛�00绯荤粺鐢ㄦ埛锛�") + @Excel(name = "鐢ㄦ埛绫诲瀷锛�00绯荤粺鐢ㄦ埛锛�") + private String userType; + + /** * 鎵嬫満鍙风爜 */ @ApiModelProperty(value = "鎵嬫満鍙风爜") @Excel(name = "鎵嬫満鍙风爜") private String phonenumber; + + /** + * 韬唤璇佸彿 + */ + @ApiModelProperty(value = "韬唤璇佸彿") + @Excel(name = "韬唤璇佸彿") + private String idCard; /** * 鐢ㄦ埛鎬у埆 @@ -114,6 +137,17 @@ private Date loginDate; /** + * 闄㈠尯淇℃伅 + */ + @ApiModelProperty(value = "闄㈠尯淇℃伅") + private String hospInfo; + /** + * 绉戝淇℃伅 + */ + @ApiModelProperty(value = "绉戝淇℃伅") + private String deptInfo; + + /** * 閮ㄩ棬瀵硅薄 */ @ApiModelProperty(value = "閮ㄩ棬瀵硅薄") @@ -122,6 +156,12 @@ @ApiModelProperty(value = "閮ㄩ棬闆嗗悎") private List<Long> depts; + + @ApiModelProperty(value = "鐥呭尯缂栫爜闆嗗悎") + private List<String> wardCodes; + + @ApiModelProperty(value = "閮ㄩ棬缂栫爜闆嗗悎") + private List<String> deptCodes; /** * 瑙掕壊瀵硅薄 @@ -147,8 +187,78 @@ @ApiModelProperty(value = "瑙掕壊ID") private Long roleId; + + /** + * 鐥呭尯缂栫爜 + */ + @ApiModelProperty("鐥呭尯闆嗗悎") + private List<Map<String, Object>> belongWards = new ArrayList(); + + /** + * 绉戝缂栫爜 + */ + @ApiModelProperty("绉戝闆嗗悎") + private List<Map<String, Object>> belongDepts = new ArrayList(); + + public SysUser() { + } + + public List<Map<String, Object>> getBelongWards() { + return belongWards; + } + + public void setBelongWards(List<Map<String, Object>> belongWards) { + this.belongWards = belongWards; + } + + public List<Map<String, Object>> getBelongDepts() { + return belongDepts; + } + + public List<String> getWardCodes() { + return wardCodes; + } + + public void setWardCodes(List<String> wardCodes) { + this.wardCodes = wardCodes; + } + + public List<String> getDeptCodes() { + return deptCodes; + } + + public void setDeptCodes(List<String> deptCodes) { + this.deptCodes = deptCodes; + } + + public void setBelongDepts(List<Map<String, Object>> belongDepts) { + this.belongDepts = belongDepts; + } + + public String getSearchscope() { + return searchscope; + } + + public void setSearchscope(String searchscope) { + this.searchscope = searchscope; + } + + public String getHospInfo() { + return hospInfo; + } + + public void setHospInfo(String hospInfo) { + this.hospInfo = hospInfo; + } + + public String getDeptInfo() { + return deptInfo; + } + + public void setDeptInfo(String deptInfo) { + this.deptInfo = deptInfo; } public SysUser(Long userId) { @@ -204,6 +314,14 @@ @Size(min = 0, max = 50, message = "閭闀垮害涓嶈兘瓒呰繃50涓瓧绗�") public String getEmail() { return email; + } + + public void setUserType(String userType) { + this.userType = userType; + } + + public String getUserType() { + return userType; } public void setEmail(String email) { @@ -323,6 +441,14 @@ this.depts = depts; } + public String getIdCard() { + return idCard; + } + + public void setIdCard(String idCard) { + this.idCard = idCard; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("userId", getUserId()).append("deptId", getDeptId()).append("userName", getUserName()).append("nickName", getNickName()).append("email", getEmail()).append("phonenumber", getPhonenumber()).append("sex", getSex()).append("avatar", getAvatar()).append("password", getPassword()).append("status", getStatus()).append("delFlag", getDelFlag()).append("loginIp", getLoginIp()).append("loginDate", getLoginDate()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("remark", getRemark()).append("dept", getDept()).toString(); -- Gitblit v1.9.3