From 430477c7e0777531f22fc18dc8906ea75cdc21d9 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期三, 03 十二月 2025 16:53:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
multi-system/src/main/java/com/gkhy/exam/system/domain/ExExamRecord.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/ExExamRecord.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/ExExamRecord.java
index 24d0bb4..7a90fa3 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/domain/ExExamRecord.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/ExExamRecord.java
@@ -13,7 +13,9 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
+import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.util.List;
import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;
@@ -45,9 +47,9 @@
@NotNull(message = "学员id不能为空")
@ApiModelProperty(value = "学员id",required = true)
@TableField("student_id")
- private Long studentId;
+ private String studentId;
- @NotBlank(message = "计划名称不能为空")
+// @NotBlank(message = "计划名称不能为空")
@ApiModelProperty(value = "计划名称",required = true)
@TableField("plan_name")
private String planName;
@@ -57,27 +59,27 @@
@TableField("course_name")
private String courseName;
+ @ApiModelProperty(value = "培训时间")
+ @TableField("plan_date")
+ private LocalDate planDate;
+
@NotNull(message = "培训等级不能为空")
@ApiModelProperty(value = "培训等级(1公司级 2部门级 3车间级 默认1)",required = true)
@TableField("level")
private Integer level;
- @NotNull(message = "要求课时不能为空")
- @ApiModelProperty(value = "要求课时(分)",required = true)
+ @ApiModelProperty(value = "要求课时(分)")
@TableField("period")
private Integer period;
- @NotNull(message = "实际课时不能为空")
- @ApiModelProperty(value = "实际课时(分)",required = true)
+ @ApiModelProperty(value = "实际课时(分)")
@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;
@@ -109,7 +111,11 @@
@ApiModelProperty("学生对象")
@TableField(exist = false)
- private ExStudent student;
+ private List<ExStudent> students;
+ @ApiModelProperty("培训记录文件")
+ @TableField(exist = false)
+ private List<RecordFile> files;
+
}
--
Gitblit v1.9.2