Browse Source

给数据库用户表添加字段: 是否ABI,部门id,供应商id,角色id

v_HuilingDeng 3 years ago
parent
commit
bdc62ba79a

+ 12 - 0
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/entity/UserInfo.java

@@ -43,6 +43,18 @@ public class UserInfo {
 	@ApiModelProperty(value = "登录密码")
     private String password;
 
+    @ApiModelProperty(value = "是否ABI")
+    private Integer isAbi;
+
+    @ApiModelProperty(value = "部门id")
+    private Long departmentId;
+
+    @ApiModelProperty(value = "供应商id")
+    private Long factoryId;
+
+    @ApiModelProperty(value = "角色id")
+    private Long roleId;
+
 	@ApiModelProperty(value = "创建时间")
     private LocalDateTime createTime;
 

+ 32 - 2
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/CreateUserReq.java

@@ -3,6 +3,8 @@ package com.abi.qms.platform.dto.req;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -13,9 +15,37 @@ import java.io.Serializable;
 @ApiModel
 public class CreateUserReq implements Serializable {
 
-  @ApiModelProperty("xxxID")
-  private String xxxId;
+  @NotEmpty(message = "员工工号为空")
+  @ApiModelProperty(value = "用户名")
+  private String userName;
+
+  @NotEmpty(message = "员工工号为空")
+  @ApiModelProperty(value = "工号")
+  private String employeeNo;
+
+  @NotEmpty(message = "员工工号为空")
+  @ApiModelProperty(value = "手机号")
+  private String phone;
+
+  @ApiModelProperty(value = "邮箱")
+  private String email;
+
+  @ApiModelProperty(value = "登录姓名")
+  private String loginName;
+
+  @ApiModelProperty(value = "登录密码")
+  private String password;
+
+  @ApiModelProperty(value = "是否ABI")
+  private Integer isAbi;
+
+  @ApiModelProperty(value = "部门id")
+  private Long departmentId;
 
+  @ApiModelProperty(value = "供应商id")
+  private Long factoryId;
 
+  @ApiModelProperty(value = "角色id")
+  private Long roleId;
 
 }

+ 5 - 1
abi-cloud-qr-platform-server/src/main/resources/dao/mapper/UserInfoMapper.xml

@@ -11,6 +11,10 @@
         <result column="EMAIL" property="email" />
         <result column="LOGIN_NAME" property="loginName" />
         <result column="PASSWORD" property="password" />
+        <result column="is_abi" property="isAbi" />
+        <result column="department_id" property="departmentId" />
+        <result column="factory_id" property="factoryId" />
+        <result column="role_id" property="roleId" />
         <result column="CREATE_TIME" property="createTime" />
         <result column="CREATE_BY" property="createBy" />
         <result column="UPDATE_TIME" property="updateTime" />
@@ -19,7 +23,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, USER_NAME, EMPLOYEE_NO, PHONE, EMAIL, LOGIN_NAME, PASSWORD, CREATE_TIME, CREATE_BY, UPDATE_TIME, IS_DELETE
+        ID, USER_NAME, EMPLOYEE_NO, PHONE, EMAIL, LOGIN_NAME, PASSWORD, is_abi, department_id, factory_id, role_id, CREATE_TIME, CREATE_BY, UPDATE_TIME, IS_DELETE
     </sql>
 
 </mapper>