返回结果优化

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

@@ -17,9 +17,9 @@ import lombok.Setter;
 @Getter
 @Setter
 public class UserAuthenticationDTO {
-    private User user;
-    private Organization organization;
-    private UserAuthentication userAuthentication;
+    //private User user;
+    //private Organization organization;
+    //private UserAuthentication userAuthentication;
 
     /**
      * 用户id
@@ -74,4 +74,34 @@ public class UserAuthenticationDTO {
      * 下属机构数量
      */
     private Integer subNum;
+
+    /**
+     * 岗位信息
+     */
+    private String position;
+
+    /**
+     * 是否通过认证 0:未通过，1:已通过
+     */
+    private Integer isReject;
+
+    /**
+     * 未通过类型
+     */
+    private Integer rejectType;
+
+    /**
+     * 认证被拒理由
+     */
+    private String rejectComment;
+
+    /**
+     * 认证状态（0：未认证，1：已认证，2：认证中）
+     */
+    private Integer authStatus;
+
+    /**
+     * 认证状态
+     */
+    private String authStatusName;
 }

user-service/src/main/java/com/diagbot/entity/UserAuthentication.java

@@ -37,10 +37,7 @@ public class UserAuthentication implements Serializable {
      * 记录修改时间
      */
     private Date gmtModified;
-    /**
-     * 认证时间
-     */
-    private Date certificationDate;
+
 
     /**
      * 创建人，0表示无创建人值
@@ -87,6 +84,11 @@ public class UserAuthentication implements Serializable {
      */
     private String remark;
 
+    /**
+     * 认证时间
+     */
+    private Date certificationDate;
+
 
     public Long getId() {
         return id;
@@ -192,6 +194,14 @@ public class UserAuthentication implements Serializable {
         this.remark = remark;
     }
 
+    public Date getCertificationDate() {
+        return certificationDate;
+    }
+
+    public void setCertificationDate(Date certificationDate) {
+        this.certificationDate = certificationDate;
+    }
+
     @Override
     public String toString() {
         return "UserAuthentication{" +
@@ -208,6 +218,7 @@ public class UserAuthentication implements Serializable {
                 ", rejectComment=" + rejectComment +
                 ", status=" + status +
                 ", remark=" + remark +
+                ", certificationDate=" + certificationDate +
                 "}";
     }
 }

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

@@ -9,7 +9,6 @@ import com.diagbot.entity.User;
 import com.diagbot.entity.UserAuthentication;
 import com.diagbot.enums.AuthStatusEnum;
 import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.enums.OrganizationTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.UserAuthenticationServiceImpl;
@@ -122,9 +121,26 @@ public class UserAuthenticationFacade extends UserAuthenticationServiceImpl {
                 eq("is_deleted", IsDeleteEnum.N.getKey());
         UserAuthentication userAuthentication = this.getOne(qw);
         UserAuthenticationDTO userAuthenticationDTO = new UserAuthenticationDTO();
-        userAuthenticationDTO.setUser(user);
-        userAuthenticationDTO.setOrganization(organization);
-        userAuthenticationDTO.setUserAuthentication(userAuthentication);
+        //userAuthenticationDTO.setUser(user);
+        userAuthenticationDTO.setUserId(user.getId());
+        userAuthenticationDTO.setUsername(user.getUsername());
+        userAuthenticationDTO.setLinkman(user.getLinkman());
+        userAuthenticationDTO.setEmail(user.getEmail());
+        userAuthenticationDTO.setUserType(user.getType());
+        //userAuthenticationDTO.setOrganization(organization);
+        userAuthenticationDTO.setOrganizationId(organization.getId());
+        userAuthenticationDTO.setOrganizationName(organization.getName());
+        userAuthenticationDTO.setOrganizationType(organization.getType());
+        userAuthenticationDTO.setPrincipal(organization.getPrincipal());
+        userAuthenticationDTO.setSubNum(organization.getSubNum());
+        userAuthenticationDTO.setAddress(organization.getAddress());
+        //userAuthenticationDTO.setUserAuthentication(userAuthentication);
+        userAuthenticationDTO.setPosition(userAuthentication.getPosition());
+        userAuthenticationDTO.setIsReject(userAuthentication.getIsReject());
+        userAuthenticationDTO.setRejectType(userAuthentication.getRejectType());
+        userAuthenticationDTO.setRejectComment(userAuthentication.getRejectComment());
+        userAuthenticationDTO.setAuthStatus(userAuthentication.getStatus());
+        userAuthenticationDTO.setAuthStatusName(AuthStatusEnum.getName(userAuthentication.getStatus()));
         return userAuthenticationDTO;
     }