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/training/entity/TrainingRegistration.java | 46 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/springblade/modules/training/entity/TrainingRegistration.java b/src/main/java/org/springblade/modules/training/entity/TrainingRegistration.java
index 607bd64..e2b57df 100644
--- a/src/main/java/org/springblade/modules/training/entity/TrainingRegistration.java
+++ b/src/main/java/org/springblade/modules/training/entity/TrainingRegistration.java
@@ -59,9 +59,10 @@
private String weight;
/**
- * 报名电话
+ * 考试id
*/
- private String phone;
+ @TableField("train_exam_id")
+ private String trainExamId;
/**
* 身份证号
@@ -76,19 +77,19 @@
private String academicUrl;
/**
- * 培训公司名称
+ * 培训公司id
*/
- @TableField("training_unit_name")
- private String trainingUnitName;
+ @TableField("training_unit_id")
+ private String trainingUnitId;
/**
- * 培训时间
+ * 培训报名时间
*/
@TableField("training_time")
- @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date trainingTime;
/**
@@ -96,4 +97,33 @@
*/
private Integer cancel;
+ /**
+ * 报名人员id
+ */
+ @TableField("user_id")
+ private String userId;
+
+ /**
+ * 是否考试 1:报名未考 2：已考
+ */
+ @TableField("is_exam")
+ private Integer isExam;
+
+ /**
+ * 准考证号
+ */
+ @TableField("candidate_no")
+ private String candidateNo;
+
+ /**
+ * 审核状态 1：审核通过 2：未通过审核 3：已提交审核 4：未提交审核
+ */
+ @TableField("audit_status")
+ private Integer auditStatus;
+
+ /**
+ * vip 状态,是否为vip 1:是 2:否
+ */
+ private Integer vipStatus;
+
}
--
Gitblit v1.9.3