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/ExamPaper.java |   47 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 46 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/exam/entity/ExamPaper.java b/src/main/java/org/springblade/modules/exam/entity/ExamPaper.java
index ee02a5b..b2e3ea6 100644
--- a/src/main/java/org/springblade/modules/exam/entity/ExamPaper.java
+++ b/src/main/java/org/springblade/modules/exam/entity/ExamPaper.java
@@ -17,10 +17,13 @@
 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.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -49,7 +52,7 @@
 	private String examName;
 
 	/**
-	 * 考试类型
+	 * 考试类型  1 正式考试  2:模拟考试
 	 */
 	private Integer examType;
 
@@ -91,6 +94,8 @@
 	/**
 	 * 创建时间
 	 */
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date creatorDate;
 
 	/**
@@ -98,5 +103,45 @@
 	 */
 	private String remark;
 
+	/**
+	 * 培训考试id
+	 */
+	@TableField("train_exam_id")
+	private Long trainExamId;
+
+	/**
+	 * 审核状态   1:通过   2:不通过  3:待审核
+	 */
+	@TableField("audit_status")
+	private Integer auditStatus;
+
+	/**
+	 * 审核明细
+	 */
+	@TableField("audit_detail")
+	private String auditDetail;
+
+	/**
+	 * 审核时间
+	 */
+	@TableField("audit_time")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date auditTime;
+
+	/**
+	 * 考试人员确认确认人
+	 */
+	@TableField("confirm_user")
+	private String confirmUser;
+
+	/**
+	 * 确认时间
+	 */
+	@TableField("confirm_time")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date confirmTime;
+
 
 }

--
Gitblit v1.9.3