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/excel/TrainingRegistrationExcel.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/training/excel/TrainingRegistrationExcel.java b/src/main/java/org/springblade/modules/training/excel/TrainingRegistrationExcel.java
index ebfa491..4e06292 100644
--- a/src/main/java/org/springblade/modules/training/excel/TrainingRegistrationExcel.java
+++ b/src/main/java/org/springblade/modules/training/excel/TrainingRegistrationExcel.java
@@ -7,11 +7,12 @@
import lombok.Data;
import java.io.Serializable;
+import java.util.Date;
/**
* TrainingRegistrationExcel
* @author zhongrj
- * @since 2021-08-12
+ * @since 2021-12-09
*/
@Data
@ColumnWidth(25)
@@ -20,15 +21,39 @@
public class TrainingRegistrationExcel implements Serializable {
private static final long serialVersionUID = 1L;
+ @ColumnWidth(15)
+ @ExcelProperty("保安姓名")
+ private String realName;
+
@ColumnWidth(25)
- @ExcelProperty("培训机构名称")
+ @ExcelProperty("考试名称")
+ private String trainExamName;
+
+ @ColumnWidth(25)
+ @ExcelProperty("所属企业名称")
private String deptName;
@ColumnWidth(15)
- @ExcelProperty("姓名")
- private String realName;
+ @ExcelProperty("准考证号")
+ private String candidateNo;
@ColumnWidth(20)
@ExcelProperty("身份证号")
private String idCardNo;
+
+ @ColumnWidth(20)
+ @ExcelProperty("报名时间")
+ private Date trainingTime;
+
+ @ColumnWidth(20)
+ @ExcelProperty("考试时间")
+ private Date trainExamTime;
+
+ @ColumnWidth(15)
+ @ExcelProperty("审核状态")
+ private String auditStatus;
+
+ @ColumnWidth(15)
+ @ExcelProperty("考试状态")
+ private String isExam;
}
--
Gitblit v1.9.3