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/excel/ExamScoreExcel.java |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springblade/modules/exam/excel/ExamScoreExcel.java b/src/main/java/org/springblade/modules/exam/excel/ExamScoreExcel.java
index 35c7b2e..4067c5f 100644
--- a/src/main/java/org/springblade/modules/exam/excel/ExamScoreExcel.java
+++ b/src/main/java/org/springblade/modules/exam/excel/ExamScoreExcel.java
@@ -33,23 +33,39 @@
 @ColumnWidth(25)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
-public class ExamScoreExcel implements Serializable {
+public class  ExamScoreExcel implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 
+	@ColumnWidth(25)
+	@ExcelProperty("考试名称*")
+	private String examName;
+
+
 	@ColumnWidth(20)
-	@ExcelProperty("姓名")
+	@ExcelProperty("姓名*")
 	private String name;
 
 
 	@ColumnWidth(25)
-	@ExcelProperty("身份证号码")
+	@ExcelProperty("身份证号码*")
 	private String idCardNo;
 
 
+//	@ColumnWidth(20)
+//	@ExcelProperty("准考证号*")
+//	private String candidateNo;
+
+//	@ColumnWidth(15)
+//	@ExcelProperty("理论得分*")
+//	private Integer theoryGrade;
+
 	@ColumnWidth(15)
-	@ExcelProperty("实操得分")
+	@ExcelProperty("实操得分*")
 	private Integer learnGrade;
 
 
+
+
+
 }

--
Gitblit v1.9.3