From 748bd2dff7201eea3adaa1adbd459be4f0cc75d3 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 19 Jul 2021 11:38:28 +0800
Subject: [PATCH] 问题修复

---
 src/main/java/org/springblade/modules/exam/entity/ExamScore.java |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 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 a16519c..bdda593 100644
--- a/src/main/java/org/springblade/modules/exam/entity/ExamScore.java
+++ b/src/main/java/org/springblade/modules/exam/entity/ExamScore.java
@@ -32,7 +32,7 @@
 	 * 准考证号
 	 */
 	@TableField("candidate_no")
-	private Long candidateNo;
+	private String candidateNo;
 
 	/**
 	 * 理论成绩
@@ -67,12 +67,20 @@
 	private String company;
 
 	/**
-	 * 考试时间
+	 * 考试开始时间
 	 */
 	@TableField("exam_time")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date examTime;
+
+	/**
+	 * 考试结束时间
+	 */
+	@TableField("exam_end_time")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date examEndTime;
 
 	/**
 	 * 考试名称
@@ -94,5 +102,10 @@
 	@TableField("all_score")
 	private Integer allScore;
 
+	/**
+	 * 是否合格  0:合格  1:不合格  2: 暂未录入实操成绩
+	 */
+	private Integer qualified;
+
 
 }

--
Gitblit v1.9.3