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 |   30 +++++++++++++++++++++++-------
 1 files changed, 23 insertions(+), 7 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 dbf54eb..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;
 
@@ -37,12 +39,14 @@
 	/**
 	 * 理论成绩
 	 */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	@TableField("theory_grade")
 	private Integer theoryGrade;
 
 	/**
 	 * 实操成绩
 	 */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	@TableField("learn_grade")
 	private Integer learnGrade;
 
@@ -50,15 +54,9 @@
 	/**
 	 * 总成绩
 	 */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	@TableField("all_grade")
 	private Integer allGrade;
-
-
-	/**
-	 * 考试类型 0:正式考试  1: 模拟考试  2:在线联系  3:调查问卷
-	 */
-//	@TableField("exam_type")
-//	private Integer examType;
 
 
 	/**
@@ -100,6 +98,7 @@
 	 * 试卷总分值
 	 */
 	@TableField("all_score")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer allScore;
 
 	/**
@@ -112,4 +111,21 @@
 	private String userId;
 
 
+	/**
+	 * 考试id
+	 */
+	@TableField("exam_id")
+	private String examId;
+
+
+	/**
+	 * 报名id
+	 */
+	@TableField("apply_id")
+	private Long applyId;
+
+
+
+
+
 }

--
Gitblit v1.9.3