From 28aaf2ffa1dbb860a292ba330a7e9362e60e7832 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: Fri, 12 Jul 2024 16:41:03 +0800
Subject: [PATCH] update
---
assess-system/src/main/java/com/gkhy/assess/system/domain/SysUser.java | 54 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 42 insertions(+), 12 deletions(-)
diff --git a/assess-system/src/main/java/com/gkhy/assess/system/domain/SysUser.java b/assess-system/src/main/java/com/gkhy/assess/system/domain/SysUser.java
index cefea2c..128ec62 100644
--- a/assess-system/src/main/java/com/gkhy/assess/system/domain/SysUser.java
+++ b/assess-system/src/main/java/com/gkhy/assess/system/domain/SysUser.java
@@ -1,14 +1,12 @@
package com.gkhy.assess.system.domain;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.gkhy.assess.common.domain.BaseEntity;
import com.gkhy.assess.common.validate.AgencyGroup;
import com.gkhy.assess.common.validate.ExpertGroup;
import com.gkhy.assess.common.validate.MonitorGroup;
+import com.gkhy.assess.system.domain.vo.PersonProjectVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@@ -17,6 +15,7 @@
import org.hibernate.validator.constraints.Length;
import javax.validation.Valid;
+import javax.validation.constraints.Max;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
@@ -53,6 +52,7 @@
@TableField("username")
private String username;
+ @Length(min = 0, max = 20, message = "用户昵称/姓名不能超过20个字符")
@ApiModelProperty("用户昵称/姓名")
@TableField("name")
private String name;
@@ -85,6 +85,9 @@
@TableField("avatar")
private String avatar;
+ /**
+ * 密码生成规则:md5(用户名+密码+盐)
+ */
@NotBlank(message = "密码不能为空")
@ApiModelProperty(value = "密码(base64)",required = true)
@TableField("password")
@@ -132,7 +135,7 @@
private String jobTitle;
@NotBlank(message = "专业方向不能为空",groups ={ExpertGroup.class} )
- @ApiModelProperty("专业方向")
+ @ApiModelProperty("专业方向,新增时传(json字符串{'专业id':'证书编号1','专业id':'证书编号2'}),查询时传字典id")
@TableField("major")
private String major;
@@ -152,25 +155,52 @@
@TableField("pwd_update_date")
private LocalDateTime pwdUpdateDate;
+ @Version
+ @ApiModelProperty("乐观锁")
+ @TableField("version")
+ private Integer version;
+
+ @ApiModelProperty("证书编号,多个证书，逗号隔开")
+ @TableField("certificate_no")
+ private String certificateNo;
+
+ @ApiModelProperty("近期证件照路径")
+ @TableField("id_photo")
+ private String idPhoto;
+
+ @ApiModelProperty("评价师等级")
+ @TableField("level")
+ private String level;
+
@Valid
@NotNull(message = "机构不能为空",groups ={AgencyGroup.class} )
- @ApiModelProperty("机构对象，只限创建机构用户传")
+ @ApiModelProperty("机构对象，只限创建机构用户传参")
@TableField(exist = false)
private SysAgency agency;
- @NotNull(message = "社保照片不能为空",groups ={ExpertGroup.class} )
- @ApiModelProperty("社保照片路径列表,创建专家传")
+
+ @ApiModelProperty("社保照片路径列表,创建专家传参")
@TableField(exist = false)
private List<SysAttach> socialAttach;
- @NotNull(message = "医保照片不能为空",groups ={ExpertGroup.class} )
- @ApiModelProperty("医保照片路径列表,创建专家传")
+ @ApiModelProperty("医保照片路径列表,创建专家传参")
@TableField(exist = false)
private List<SysAttach> medicalAttach;
- @NotNull(message = "工资照片不能为空",groups ={ExpertGroup.class} )
- @ApiModelProperty("工资照片路径列表,创建专家传")
+ @ApiModelProperty("工资照片路径列表,创建专家传参")
@TableField(exist = false)
private List<SysAttach> salaryAttach;
+ @ApiModelProperty("专业列表")
+ @TableField(exist = false)
+ List<String> majorNames;
+
+ @ApiModelProperty("汇总项目信息")
+ @TableField(exist = false)
+ private PersonProjectVO personProjectVO;
+
+ @ApiModelProperty("机构名称")
+ @TableField(exist = false)
+ private String agencyName;
+
}
--
Gitblit v1.9.2