From 045b55722b25ccc77d88671c5d6df309edb8a66d Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Tue, 22 Feb 2022 16:00:34 +0800
Subject: [PATCH] 1. 保安员新增异步推送数据至群访用户表 2. 会员标记接口新增,会员标记成功,则创建会员记录和会员题库记录(包含120道题目) 3. web 端考试开始,查询题目判断用户是否为会员,如果为会员则从会员题库获取当前人员的考试题目(从120道题中随机抽取60道)
---
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