用户认证历史纪录

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

@@ -1,9 +1,8 @@
 package com.diagbot.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
 import java.io.Serializable;
 import java.util.Date;
 
@@ -13,7 +12,7 @@ import java.util.Date;
  * </p>
  *
  * @author gaodm
- * @since 2018-08-30
+ * @since 2018-10-22
  */
 @TableName("sys_user")
 public class User implements Serializable {
@@ -51,31 +50,25 @@ public class User implements Serializable {
      */
     private String modifier;
 
-    /**
-     * 用户密码
-     */
-    private String password;
-
     /**
      * 用户名
      */
     private String username;
 
-
     /**
-     * 联系人
+     * 用户密码
      */
-    private String linkman;
+    private String password;
 
     /**
-     * 邮箱
+     * 联系人
      */
-    private String email;
+    private String linkman;
 
     /**
-     * 所属部门
+     * 手机号(如果是客户，phone与username是一样的)
      */
-    private String dept;
+    private String phone;
 
     /**
      * 所属岗位
@@ -83,26 +76,35 @@ public class User implements Serializable {
     private String position;
 
     /**
-     * 手机号码
+     * 所属部门
      */
-    private String phone;
+    private String dept;
 
     /**
-     * 用户类型
+     * 邮箱
      */
-    private Integer type;
+    private String email;
 
     /**
-     * 认证状态
+     * 认证状态: 0 未认证，1 已认证，2 认证中
      */
     private Integer authStatus;
 
-
     /**
      * 认证通过时间
      */
     private Date passauthTime;
 
+    /**
+     * 1内部用户，0外部用户（默认0）
+     */
+    private Integer type;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
     public Long getId() {
         return id;
     }
@@ -110,7 +112,6 @@ public class User implements Serializable {
     public void setId(Long id) {
         this.id = id;
     }
-
     public String getIsDeleted() {
         return isDeleted;
     }
@@ -118,7 +119,6 @@ public class User implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-
     public Date getGmtCreate() {
         return gmtCreate;
     }
@@ -126,7 +126,6 @@ public class User implements Serializable {
     public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-
     public Date getGmtModified() {
         return gmtModified;
     }
@@ -134,7 +133,6 @@ public class User implements Serializable {
     public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
-
     public String getCreator() {
         return creator;
     }
@@ -142,7 +140,6 @@ public class User implements Serializable {
     public void setCreator(String creator) {
         this.creator = creator;
     }
-
     public String getModifier() {
         return modifier;
     }
@@ -150,15 +147,6 @@ public class User implements Serializable {
     public void setModifier(String modifier) {
         this.modifier = modifier;
     }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
     public String getUsername() {
         return username;
     }
@@ -166,7 +154,13 @@ public class User implements Serializable {
     public void setUsername(String username) {
         this.username = username;
     }
+    public String getPassword() {
+        return password;
+    }
 
+    public void setPassword(String password) {
+        this.password = password;
+    }
     public String getLinkman() {
         return linkman;
     }
@@ -174,23 +168,13 @@ public class User implements Serializable {
     public void setLinkman(String linkman) {
         this.linkman = linkman;
     }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public String getDept() {
-        return dept;
+    public String getPhone() {
+        return phone;
     }
 
-    public void setDept(String dept) {
-        this.dept = dept;
+    public void setPhone(String phone) {
+        this.phone = phone;
     }
-
     public String getPosition() {
         return position;
     }
@@ -198,23 +182,20 @@ public class User implements Serializable {
     public void setPosition(String position) {
         this.position = position;
     }
-
-    public String getPhone() {
-        return phone;
+    public String getDept() {
+        return dept;
     }
 
-    public void setPhone(String phone) {
-        this.phone = phone;
+    public void setDept(String dept) {
+        this.dept = dept;
     }
-
-    public Integer getType() {
-        return type;
+    public String getEmail() {
+        return email;
     }
 
-    public void setType(Integer type) {
-        this.type = type;
+    public void setEmail(String email) {
+        this.email = email;
     }
-
     public Integer getAuthStatus() {
         return authStatus;
     }
@@ -222,7 +203,6 @@ public class User implements Serializable {
     public void setAuthStatus(Integer authStatus) {
         this.authStatus = authStatus;
     }
-
     public Date getPassauthTime() {
         return passauthTime;
     }
@@ -230,27 +210,41 @@ public class User implements Serializable {
     public void setPassauthTime(Date passauthTime) {
         this.passauthTime = passauthTime;
     }
+    public Integer getType() {
+        return type;
+    }
 
+    public void setType(Integer type) {
+        this.type = type;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 
     @Override
     public String toString() {
         return "User{" +
-                "id=" + id +
-                ", isDeleted='" + isDeleted + '\'' +
-                ", gmtCreate=" + gmtCreate +
-                ", gmtModified=" + gmtModified +
-                ", creator='" + creator + '\'' +
-                ", modifier='" + modifier + '\'' +
-                ", password='" + password + '\'' +
-                ", username='" + username + '\'' +
-                ", linkman='" + linkman + '\'' +
-                ", email='" + email + '\'' +
-                ", dept='" + dept + '\'' +
-                ", position='" + position + '\'' +
-                ", phone='" + phone + '\'' +
-                ", type=" + type +
-                ", authStatus=" + authStatus +
-                ", passauthTime=" + passauthTime +
-                '}';
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", username=" + username +
+        ", password=" + password +
+        ", linkman=" + linkman +
+        ", phone=" + phone +
+        ", position=" + position +
+        ", dept=" + dept +
+        ", email=" + email +
+        ", authStatus=" + authStatus +
+        ", passauthTime=" + passauthTime +
+        ", type=" + type +
+        ", remark=" + remark +
+        "}";
     }
 }

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

@@ -55,9 +55,9 @@ public class UserAuthentication implements Serializable {
     private Long userId;
 
     /**
-     * 岗位信息
+     * 申请单号
      */
-    private String position;
+    private String orderNum;
 
     /**
      * 是否通过认证 0:未通过，1:已通过
@@ -75,7 +75,7 @@ public class UserAuthentication implements Serializable {
     private String rejectComment;
 
     /**
-     * 认证状态（0：未认证，1：已认证，2：认证中）
+     * 处理状态（0：待处理，1：已处理）
      */
     private Integer status;
 
@@ -146,12 +146,12 @@ public class UserAuthentication implements Serializable {
         this.userId = userId;
     }
 
-    public String getPosition() {
-        return position;
+    public String getOrderNum() {
+        return orderNum;
     }
 
-    public void setPosition(String position) {
-        this.position = position;
+    public void setOrderNum(String orderNum) {
+        this.orderNum = orderNum;
     }
 
     public Integer getIsReject() {
@@ -212,7 +212,7 @@ public class UserAuthentication implements Serializable {
                 ", creator=" + creator +
                 ", modifier=" + modifier +
                 ", userId=" + userId +
-                ", position=" + position +
+                ", orderNum=" + orderNum +
                 ", isReject=" + isReject +
                 ", rejectType=" + rejectType +
                 ", rejectComment=" + rejectComment +

user-service/src/main/resources/mapper/UserAuthenticationMapper.xml

@@ -13,7 +13,7 @@
         <result column="creator" property="creator"/>
         <result column="modifier" property="modifier"/>
         <result column="user_id" property="userId"/>
-        <result column="position" property="position"/>
+        <result column="order_num" property="orderNum"/>
         <result column="is_reject" property="isReject"/>
         <result column="reject_type" property="rejectType"/>
         <result column="reject_comment" property="rejectComment"/>

user-service/src/main/resources/mapper/UserMapper.xml

@@ -5,19 +5,23 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.User">
-        <id column="id" property="id"/>
-        <result column="is_deleted" property="isDeleted"/>
-        <result column="gmt_create" property="gmtCreate"/>
-        <result column="gmt_modified" property="gmtModified"/>
-        <result column="creator" property="creator"/>
-        <result column="modifier" property="modifier"/>
-        <result column="password" property="password"/>
-        <result column="username" property="username"/>
-        <result column="dept" property="dept"/>
-        <result column="position" property="position"/>
-        <result column="linkman" property="linkman"/>
-        <result column="email" property="email"/>
-        <result column="type" property="type"/>
+        <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+        <result column="username" property="username" />
+        <result column="password" property="password" />
+        <result column="linkman" property="linkman" />
+        <result column="phone" property="phone" />
+        <result column="position" property="position" />
+        <result column="dept" property="dept" />
+        <result column="email" property="email" />
+        <result column="auth_status" property="authStatus" />
+        <result column="passauth_time" property="passauthTime" />
+        <result column="type" property="type" />
+        <result column="remark" property="remark" />
     </resultMap>
 
     <resultMap id="UserOrgDTO" type="com.diagbot.dto.UserOrgDTO">