From f0f00e9ba8a755e4317e029d73b69a92ad9f9df1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期六, 14 九月 2024 17:02:41 +0800
Subject: [PATCH] update

---
 exam-system/src/main/java/com/gkhy/exam/system/domain/ExExamRecord.java |   32 +++++++++++++++++++++++++-------
 1 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/exam-system/src/main/java/com/gkhy/exam/system/domain/ExExamRecord.java b/exam-system/src/main/java/com/gkhy/exam/system/domain/ExExamRecord.java
index 280ce14..24d0bb4 100644
--- a/exam-system/src/main/java/com/gkhy/exam/system/domain/ExExamRecord.java
+++ b/exam-system/src/main/java/com/gkhy/exam/system/domain/ExExamRecord.java
@@ -4,13 +4,18 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+
+import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;
 
 /**
  * <p>
@@ -24,6 +29,7 @@
 @Setter
 @TableName("ex_exam_record")
 @ApiModel(value = "ExExamRecord对象", description = "线下教育登记表")
+@JsonInclude(NON_NULL)
 public class ExExamRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -36,34 +42,42 @@
     @TableField("company_id")
     private Long companyId;
 
-    @ApiModelProperty("学员id")
+    @NotNull(message = "学员id不能为空")
+    @ApiModelProperty(value = "学员id",required = true)
     @TableField("student_id")
     private Long studentId;
 
-    @ApiModelProperty("计划名称")
+    @NotBlank(message = "计划名称不能为空")
+    @ApiModelProperty(value = "计划名称",required = true)
     @TableField("plan_name")
     private String planName;
 
-    @ApiModelProperty("课程名称")
+    @NotBlank(message = "课程名称不能为空")
+    @ApiModelProperty(value = "课程名称",required = true)
     @TableField("course_name")
     private String courseName;
 
-    @ApiModelProperty("培训等级")
+    @NotNull(message = "培训等级不能为空")
+    @ApiModelProperty(value = "培训等级(1公司级 2部门级 3车间级 默认1)",required = true)
     @TableField("level")
-    private String level;
+    private Integer level;
 
-    @ApiModelProperty("要求课时(分)")
+    @NotNull(message = "要求课时不能为空")
+    @ApiModelProperty(value = "要求课时(分)",required = true)
     @TableField("period")
     private Integer period;
 
-    @ApiModelProperty("实际课时(分)")
+    @NotNull(message = "实际课时不能为空")
+    @ApiModelProperty(value = "实际课时(分)",required = true)
     @TableField("actual_period")
     private Integer actualPeriod;
 
+    @NotNull(message = "考试成绩不能为空")
     @ApiModelProperty("考试成绩")
     @TableField("score")
     private Integer score;
 
+    @NotNull(message = "是否合格不能为空")
     @ApiModelProperty("是否合格,0不合格 1合格 默认0")
     @TableField("passed")
     private Integer passed;
@@ -93,5 +107,9 @@
     @TableField(exist = false)
     private String companyName;
 
+    @ApiModelProperty("学生对象")
+    @TableField(exist = false)
+    private ExStudent student;
+
 
 }

--
Gitblit v1.9.2