From 045b55722b25ccc77d88671c5d6df309edb8a66d Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Tue, 22 Feb 2022 16:00:34 +0800
Subject: [PATCH] 1. 保安员新增异步推送数据至群访用户表 2. 会员标记接口新增,会员标记成功,则创建会员记录和会员题库记录(包含120道题目) 3. web 端考试开始,查询题目判断用户是否为会员,如果为会员则从会员题库获取当前人员的考试题目(从120道题中随机抽取60道)
---
src/main/java/org/springblade/modules/exam/entity/ExamScore.java | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 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 4e976ae..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,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,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