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/vo/ExamPaperVO.java |   93 ++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 76 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/springblade/modules/exam/vo/ExamPaperVO.java b/src/main/java/org/springblade/modules/exam/vo/ExamPaperVO.java
index 227726b..bc87251 100644
--- a/src/main/java/org/springblade/modules/exam/vo/ExamPaperVO.java
+++ b/src/main/java/org/springblade/modules/exam/vo/ExamPaperVO.java
@@ -1,43 +1,102 @@
 package org.springblade.modules.exam.vo;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.modules.desk.entity.Notice;
+import org.springblade.modules.exam.entity.ExamPaper;
+
+import java.util.Date;
 
 /**
- * 通知公告视图类
+ * 考试类
  *
  * @author Chill
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class ExamPaperVO extends Notice {
-
-	@ApiModelProperty(value = "通知类型名")
-	private String categoryName;
-
-	@ApiModelProperty(value = "租户编号")
-	private String tenantId;
+public class ExamPaperVO extends ExamPaper {
+	/**
+	 * 考试人员姓名/申请人名字
+	 */
+	private String realName;
 
 	/**
-	 * 通知开始时间
+	 * 身份证号
 	 */
-	private String startTime;
+	private String idCardNo;
 
 	/**
-	 * 通知结束时间
+	 * 准考证号
 	 */
-	private String endTime;
+	private String candidateNo;
 
 	/**
-	 * 行政区(辖区)id
+	 * 性别 1 男  2 女
 	 */
-	private Long jurisdiction;
+	private Integer sex;
+
+	/**
+	 * 报名 id
+	 */
+	private Long applyId;
+
+	/**
+	 * 报名人数
+	 */
+	private Integer num;
+
+	/**
+	 * 申请人部门名称
+	 */
+	private String deptName;
+
+	/**
+	 * 申请人部门id
+	 */
+	private String deptId;
+
+	/**
+	 * 得分id
+	 */
+	private Long scoreId;
+
+	/**
+	 * 考试人数
+	 */
+	private Integer examNum;
+
+	/**
+	 * 确认人员姓名
+	 */
+	private String confirmUserName;
+
+	/**
+	 * 计算截止时间
+	 */
+	private String deadline;
+
+	/**
+	 * 考试状态
+	 */
+	private Integer isExam;
+
+	/**
+	 * 考试开始时间
+	 */
+	private Date examStartTime;
+
 
 	/**
 	 * 用户id
 	 */
-	private Long userId;
+	private String userId;
 
+	/**
+	 * 考试时间
+	 */
+	private String examTime;
+
+	/**
+	 * 学校名称
+	 */
+	private String schoolName;
 }

--
Gitblit v1.9.3