From c9d2e60f7d1a5cfe9e5b2da93af4d9edeecf5577 Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: Tue, 26 Nov 2024 16:04:21 +0800
Subject: [PATCH] 部分修改
---
expert-system/src/main/java/com/gkhy/system/domain/SysExpertInfo.java | 42 +++++++++++++++++++++++++++++++-----------
1 files changed, 31 insertions(+), 11 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..7f4790e 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,22 +1,20 @@
-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;
-import lombok.Setter;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.hibernate.validator.constraints.Length;
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;
@@ -28,8 +26,8 @@
* @author kzy
* @since 2023-11-27 16:33:33
*/
-@Getter
-@Setter
+@EqualsAndHashCode(callSuper = true)
+@Data
@TableName("sys_expert_info")
@Accessors(chain = true)
@ApiModel(value = "SysExpertInfo对象", description = "系统专家信息表")
@@ -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,27 @@
@TableField("level")
private String level;
+ @ApiModelProperty("评定等级1、一级，2、二级，3、三级")
+ @TableField("rating_level")
+ private String ratingLevel;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField("employment_date_start")
+ @ApiModelProperty("聘书有效开始时间")
+ private Date employmentDateStart;
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField("employment_date_end")
+ @ApiModelProperty("聘书有效结束时间")
+ private Date employmentDateEnd;
+
+ @NotNull(message ="业务处室不能为空" )
+ @ApiModelProperty("业务处室")
+ @TableField("dept_id")
+ private Long deptId;
+
+ @ApiModelProperty("专家聘书")
+ @TableField("expert_certificate")
+ private String expertCertificate;
}
--
Gitblit v1.9.2