From 33a072160eda4fa7cb22d330c2bfa9048ad6c0e9 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 22 Jul 2021 14:11:50 +0800
Subject: [PATCH] 派遣记录接口修改

---
 src/main/java/org/springblade/modules/exam/entity/ExamScore.java |   26 ++++++++++++++++++++++----
 1 files changed, 22 insertions(+), 4 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..989f442 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;
 
 	/**
 	 * 理论成绩
@@ -57,8 +57,8 @@
 	/**
 	 * 考试类型 0:正式考试  1: 模拟考试  2:在线联系  3:调查问卷
 	 */
-	@TableField("exam_type")
-	private Integer examType;
+//	@TableField("exam_type")
+//	private Integer examType;
 
 
 	/**
@@ -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,15 @@
 	@TableField("all_score")
 	private Integer allScore;
 
+	/**
+	 * 是否合格  0:合格  1:不合格  2: 暂未录入实操成绩
+	 */
+	private Integer qualified;
 
+
+	/**
+	 * 用户id
+	 */
+	@TableField("user_id")
+	private String userId;
 }

--
Gitblit v1.9.3