From 8b375fe00a241b3a769b82fe3dac8d1c9dce8a02 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 16 Jun 2022 14:36:07 +0800
Subject: [PATCH] 模拟考试修改
---
src/main/java/org/springblade/modules/exam/entity/ExamScore.java | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/entity/ExamScore.java b/src/main/java/org/springblade/modules/exam/entity/ExamScore.java
index 00fcf26..0ebb9eb 100644
--- a/src/main/java/org/springblade/modules/exam/entity/ExamScore.java
+++ b/src/main/java/org/springblade/modules/exam/entity/ExamScore.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.NullSerializer;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -32,17 +34,19 @@
* 准考证号
*/
@TableField("candidate_no")
- private Long candidateNo;
+ private String candidateNo;
/**
* 理论成绩
*/
+ @JsonSerialize(nullsUsing = NullSerializer.class)
@TableField("theory_grade")
private Integer theoryGrade;
/**
* 实操成绩
*/
+ @JsonSerialize(nullsUsing = NullSerializer.class)
@TableField("learn_grade")
private Integer learnGrade;
@@ -50,19 +54,13 @@
/**
* 总成绩
*/
+ @JsonSerialize(nullsUsing = NullSerializer.class)
@TableField("all_grade")
private Integer allGrade;
/**
- * 考试类型 0：正式考试 1： 模拟考试 2：在线联系 3：调查问卷
- */
- @TableField("exam_type")
- private Integer examType;
-
-
- /**
- * 考试人员所属公司名称
+ * 考试人员所属公司名称id
*/
private String company;
@@ -100,7 +98,34 @@
* 试卷总分值
*/
@TableField("all_score")
+ @JsonSerialize(nullsUsing = NullSerializer.class)
private Integer allScore;
+ /**
+ * 是否合格 0：合格 1：不合格 2： 暂未录入实操成绩
+ */
+ private Integer qualified;
+
+
+ @TableField("user_id")
+ private String userId;
+
+
+ /**
+ * 考试id
+ */
+ @TableField("exam_id")
+ private String examId;
+
+
+ /**
+ * 报名id
+ */
+ @TableField("apply_id")
+ private Long applyId;
+
+
+
+
}
--
Gitblit v1.9.3