枚举set

user-service/src/main/java/com/diagbot/dto/UserInfoDTO.java

@@ -6,6 +6,8 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.diagbot.enums.AuthStatusEnum;
+import com.diagbot.enums.OrganizationTypeEnum;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -16,8 +18,6 @@ import lombok.Setter;
  * @Description: 用户信息类表
  * @date 2018年9月17日 下午4:35:35
  */
-@Setter
-@Getter
 public class UserInfoDTO implements Serializable{
 	
 	 private static final long serialVersionUID = 1L;
@@ -33,6 +33,7 @@ public class UserInfoDTO implements Serializable{
 	    private Date orgGmtCreate;//记录创建时间
 	    private String orgName;//机构名称
 	    private Integer orgType;//机构属性
+	    private String  orgTypeStr;//机构属性String
 	    private String orgPrincipal;//负责人
 	    private String orgAddress;//机构地址
 	    private Long orgParentId;//上级机构id
@@ -40,5 +41,127 @@ public class UserInfoDTO implements Serializable{
 	    private String autPosition;//岗位信息
 	    private Integer autIsReject;//是否通过认证 N:未通过，Y:已通过
 	    private Integer autStatus;//认证状态
+	    private String autStatusStr;//认证状态String
+		public Long getUserId() {
+			return userId;
+		}
+		public void setUserId(Long userId) {
+			this.userId = userId;
+		}
+		public Date getUserGmtCreate() {
+			return userGmtCreate;
+		}
+		public void setUserGmtCreate(Date userGmtCreate) {
+			this.userGmtCreate = userGmtCreate;
+		}
+		public String getUserName() {
+			return userName;
+		}
+		public void setUserName(String userName) {
+			this.userName = userName;
+		}
+		public String getLinKman() {
+			return linKman;
+		}
+		public void setLinKman(String linKman) {
+			this.linKman = linKman;
+		}
+		public String getEmail() {
+			return email;
+		}
+		public void setEmail(String email) {
+			this.email = email;
+		}
+		public Long getOrgId() {
+			return orgId;
+		}
+		public void setOrgId(Long orgId) {
+			this.orgId = orgId;
+		}
+		public Date getOrgGmtCreate() {
+			return orgGmtCreate;
+		}
+		public void setOrgGmtCreate(Date orgGmtCreate) {
+			this.orgGmtCreate = orgGmtCreate;
+		}
+		public String getOrgName() {
+			return orgName;
+		}
+		public void setOrgName(String orgName) {
+			this.orgName = orgName;
+		}
+		public Integer getOrgType() {
+			return orgType;
+		}
+		public void setOrgType(Integer orgType) {
+			if(orgType!=null){
+				setOrgTypeStr(OrganizationTypeEnum.getName(orgType));	
+			}
+			this.orgType = orgType;
+		}
+		public String getOrgTypeStr() {
+			return orgTypeStr;
+		}
+		public void setOrgTypeStr(String orgTypeStr) {
+			this.orgTypeStr = orgTypeStr;
+		}
+		public String getOrgPrincipal() {
+			return orgPrincipal;
+		}
+		public void setOrgPrincipal(String orgPrincipal) {
+			this.orgPrincipal = orgPrincipal;
+		}
+		public String getOrgAddress() {
+			return orgAddress;
+		}
+		public void setOrgAddress(String orgAddress) {
+			this.orgAddress = orgAddress;
+		}
+		public Long getOrgParentId() {
+			return orgParentId;
+		}
+		public void setOrgParentId(Long orgParentId) {
+			this.orgParentId = orgParentId;
+		}
+		public Integer getOrgSubNum() {
+			return orgSubNum;
+		}
+		public void setOrgSubNum(Integer orgSubNum) {
+			this.orgSubNum = orgSubNum;
+		}
+		public String getAutPosition() {
+			return autPosition;
+		}
+		public void setAutPosition(String autPosition) {
+			this.autPosition = autPosition;
+		}
+		public Integer getAutIsReject() {
+			return autIsReject;
+		}
+		public void setAutIsReject(Integer autIsReject) {
+			this.autIsReject = autIsReject;
+		}
+		public Integer getAutStatus() {
+			return autStatus;
+		}
+		public void setAutStatus(Integer autStatus) {
+			if(autStatus!=null){
+				setAutStatusStr(AuthStatusEnum.getName(autStatus));
+			}
+			this.autStatus = autStatus;
+		}
+		public static long getSerialversionuid() {
+			return serialVersionUID;
+		}
+		public String getAutStatusStr() {
+			return autStatusStr;
+		}
+		public void setAutStatusStr(String autStatusStr) {
+			this.autStatusStr = autStatusStr;
+		}
+	
+	    
+	    
+	    
 
 }

user-service/src/main/java/com/diagbot/facade/UserFacade.java

@@ -17,6 +17,8 @@ import com.diagbot.entity.UserAuthentication;
 import com.diagbot.entity.UserOrganization;
 import com.diagbot.entity.UserRole;
 import com.diagbot.entity.wrapper.MenuWrapper;
+import com.diagbot.enums.AuthStatusEnum;
+import com.diagbot.enums.OrganizationTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.exception.ServiceErrorCode;
@@ -466,14 +468,14 @@ public class UserFacade extends UserServiceImpl {
 					userInfo.getEmail(),
 					String.valueOf(userInfo.getOrgId()),
 					userInfo.getOrgName(),
-					String.valueOf(userInfo.getOrgType()),
+					OrganizationTypeEnum.getName(userInfo.getOrgType()),
 					userInfo.getOrgPrincipal(),
 					userInfo.getOrgAddress(),
 					String.valueOf(userInfo.getOrgParentId()),
 					String.valueOf(userInfo.getOrgSubNum()),
 					userInfo.getAutPosition(),
 					String.valueOf(userInfo.getAutIsReject()),
-					String.valueOf(userInfo.getAutStatus())));
+					AuthStatusEnum.getName(userInfo.getAutStatus())));
 		}
 		//response.setContentType("text/html;charset=UTF-8");
 		String filePath =userExportVO.getFilePath();//文件路径