From 62eb499b0c969f246d3245d1429a97da4de1ce28 Mon Sep 17 00:00:00 2001
From: 钟日健 <arsn163@163.com>
Date: Mon, 01 Jun 2026 20:46:13 +0800
Subject: [PATCH] feat: 成绩查询增加年龄查询返回
---
src/main/java/org/springblade/modules/exam/entity/ExamScore.java | 55 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 42 insertions(+), 13 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..55cfb3d 100644
--- a/src/main/java/org/springblade/modules/exam/entity/ExamScore.java
+++ b/src/main/java/org/springblade/modules/exam/entity/ExamScore.java
@@ -1,10 +1,9 @@
package org.springblade.modules.exam.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
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 +31,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 +51,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 +95,41 @@
* 试卷总分值
*/
@TableField("all_score")
+ @JsonSerialize(nullsUsing = NullSerializer.class)
private Integer allScore;
+ /**
+ * 是否合格 0：合格 1：不合格 2： 暂未录入实操成绩
+ */
+ private Integer qualified;
+
+
+ @TableField("user_id")
+ private Long userId;
+
+
+ /**
+ * 考试id
+ */
+ @TableField("exam_id")
+ private String examId;
+
+
+ /**
+ * 报名id
+ */
+ @TableField("apply_id")
+ private Long applyId;
+
+ /**
+ * 是否删除
+ */
+ @TableField("is_deleted")
+ @TableLogic
+ private Integer isDeleted;
+
+
+
+
}
--
Gitblit v1.9.3