From 2d27b24029adafdbfc5703b38a519d65beda6a68 Mon Sep 17 00:00:00 2001 From: heheng <heheng@123456> Date: 星期三, 20 十一月 2024 16:23:23 +0800 Subject: [PATCH] 更改 --- expert-system/src/main/java/com/gkhy/system/domain/SysExpertInfo.java | 32 +++++++++++++++++++++++++------- 1 files changed, 25 insertions(+), 7 deletions(-) diff --git a/expert-system/src/main/java/com/gkhy/system/domain/SysExpertInfo.java b/expert-system/src/main/java/com/gkhy/system/domain/SysExpertInfo.java index 2d201cc..c83affc 100644 --- a/expert-system/src/main/java/com/gkhy/system/domain/SysExpertInfo.java +++ b/expert-system/src/main/java/com/gkhy/system/domain/SysExpertInfo.java @@ -1,12 +1,9 @@ -package com.gkhy.assess.system.domain; +package com.gkhy.system.domain; import com.baomidou.mybatisplus.annotation.*; - -import java.io.Serializable; -import java.time.LocalDateTime; - +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; -import com.gkhy.assess.common.domain.BaseEntity; +import com.gkhy.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; @@ -17,6 +14,7 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; +import java.util.Date; import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL; @@ -66,7 +64,8 @@ @NotNull(message ="出生日期不能为空" ) @ApiModelProperty("出生日期") @TableField("birthday") - private LocalDateTime birthday; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date birthday; @NotBlank(message ="手机号不能为空" ) @Length(min = 11, max = 11, message = "手机号只能为11位") @@ -208,6 +207,25 @@ @TableField("level") private String level; + @ApiModelProperty("评定等级1、一级,2、二级,3、三级") + @TableField("rating_level") + private String ratingLevel; + @JsonFormat(pattern = "yyyy-MM-dd") + @TableField("employment_date_start") + private Date employmentDateStart; + + @JsonFormat(pattern = "yyyy-MM-dd") + @TableField("employment_date_end") + private Date employmentDateEnd; + + @NotNull(message ="业务处室不能为空" ) + @ApiModelProperty("业务处室") + @TableField("dept_id") + private Long deptId; + + @ApiModelProperty("专家证书") + @TableField("expert_certificate") + private String expertCertificate; } -- Gitblit v1.9.2