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/system/excel/UserExcel.java | 57 +++++++++------------------------------------------------
1 files changed, 9 insertions(+), 48 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/excel/UserExcel.java b/src/main/java/org/springblade/modules/system/excel/UserExcel.java
index 31a5970..d3d032a 100644
--- a/src/main/java/org/springblade/modules/system/excel/UserExcel.java
+++ b/src/main/java/org/springblade/modules/system/excel/UserExcel.java
@@ -38,65 +38,26 @@
public class UserExcel implements Serializable {
private static final long serialVersionUID = 1L;
- @ColumnWidth(15)
- @ExcelProperty("账户")
- private String account;
-
- @ExcelProperty("单位名称")
+ @ExcelProperty("企业名称*")
private String deptId;
+ @ColumnWidth(15)
+ @ExcelProperty("警号*")
+ private String code;
+
@ColumnWidth(10)
- @ExcelProperty("姓名")
+ @ExcelProperty("姓名*")
private String realName;
- @ExcelProperty("邮箱")
- private String email;
-
@ColumnWidth(15)
- @ExcelProperty("手机")
+ @ExcelProperty("联系电话")
private String phone;
-
- @ExcelProperty("性别")
+ @ExcelProperty("性别*")
private String sex;
- @ExcelProperty("出生日期")
- private String birthtime;
-
- @ExcelProperty("身份证")
+ @ExcelProperty("身份证号*")
private String cardid;
-
- @ExcelProperty("籍贯")
- private String nativeplace;
-
- @ExcelProperty("民族")
- private String nation;
-
- @ExcelProperty("政治面貌")
- private String politicaloutlook;
-
-
- @ExcelProperty("身高")
- private Float height;
-
-
- @ExcelProperty("联系地址")
- private String address;
-
- @ExcelProperty("户口所在地")
- private String registered;
-
- @ExcelProperty("入职时间")
- private String rtime;
-
- @ExcelProperty("是否持证")
- private String hold;
-
- @ExcelProperty("保安员证编码")
- private String securitynumber;
-
- @ExcelProperty("在职状态")
- private String status;
}
--
Gitblit v1.9.3