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/apply/entity/Apply.java |   42 +++++++++++++++++++++++++++++++++++++++---
 1 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/apply/entity/Apply.java b/src/main/java/org/springblade/modules/apply/entity/Apply.java
index 2f98fca..a2d1602 100644
--- a/src/main/java/org/springblade/modules/apply/entity/Apply.java
+++ b/src/main/java/org/springblade/modules/apply/entity/Apply.java
@@ -21,10 +21,7 @@
 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;
@@ -142,4 +139,43 @@
 	@TableField("fail_reason")
 	private String failReason;
 
+
+	/**
+	 * 考试id
+	 */
+	@TableField("exam_id")
+	private Long examId;
+
+
+	/**
+	 * 考试时间
+	 */
+	@TableField("exam_time")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date examTime;
+
+	/**
+     * 审核状态
+	 */
+	@TableField("examination_type")
+	private String examinationType;
+
+	/**
+	 * 审核明细
+	 */
+	@TableField("examination_mx")
+	private String examinationMx;
+
+	/**
+	 * 报名编号
+	 */
+	@TableField("apply_code")
+	private String applyCode;
+
+	/**
+	 * 是否考试  1:报名未考   2:已考
+	 */
+	@TableField("is_exam")
+	private Integer isExam;
 }

--
Gitblit v1.9.3