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 | 75 +++++++++++++++++++++++++++----------
1 files changed, 54 insertions(+), 21 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 cb4e7f7..b2e3ea6 100644
--- a/src/main/java/org/springblade/modules/exam/entity/ExamPaper.java
+++ b/src/main/java/org/springblade/modules/exam/entity/ExamPaper.java
@@ -20,10 +20,10 @@
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 lombok.EqualsAndHashCode;
-import org.springblade.core.tenant.mp.TenantEntity;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
@@ -49,50 +49,42 @@
/**
* 考试名称
*/
- @TableField("exam_name")
- private String exam_name;
+ private String examName;
/**
- * 考试类型
+ * 考试类型 1 正式考试 2：模拟考试
*/
- @TableField("exam_type")
- private String exam_type;
+ private Integer examType;
/**
* 注意事项
*/
- @TableField("exam_attention")
- private String exam_attention;
+ private String examAttention;
/**
* 考试开始时间
*/
- @TableField("start_time")
- private Date start_time;
+ private Date startTime;
/**
* 考试结束时间
*/
- @TableField("end_time")
- private Date end_time;
+ private Date endTime;
/**
* 时间区间
*/
- @TableField("exam_time")
- private String exam_time;
+ private String examTime;
/**
* 总分
*/
- @TableField("total_score")
- private String total_score;
+ private String totalScore;
/**
* 状态
*/
- @TableField("exam_status")
- private String exam_status;
+ private Integer examStatus;
/**
* 创建人
@@ -102,13 +94,54 @@
/**
* 创建时间
*/
- @TableField("creator_date")
- private Date creator_date;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date creatorDate;
/**
* 备注
*/
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