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 | 64 +++++++------------------------
1 files changed, 15 insertions(+), 49 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 d062bea..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,60 +38,26 @@
public class UserExcel implements Serializable {
private static final long serialVersionUID = 1L;
- @ColumnWidth(15)
- @ExcelProperty("租户编号")
- private String tenantId;
-
- @ExcelIgnore
- @ExcelProperty("用户平台")
- private String userType;
-
- @ColumnWidth(20)
- @ExcelProperty("用户平台名称")
- private String userTypeName;
-
- @ColumnWidth(15)
- @ExcelProperty("账户")
- private String account;
-
- @ColumnWidth(10)
- @ExcelProperty("昵称")
- private String name;
-
- @ColumnWidth(10)
- @ExcelProperty("姓名")
- private String realName;
-
- @ExcelProperty("邮箱")
- private String email;
-
- @ColumnWidth(15)
- @ExcelProperty("手机")
- private String phone;
-
- @ExcelIgnore
- @ExcelProperty("角色ID")
- private String roleId;
-
- @ExcelIgnore
- @ExcelProperty("部门ID")
+ @ExcelProperty("企业名称*")
private String deptId;
- @ExcelIgnore
- @ExcelProperty("岗位ID")
- private String postId;
+ @ColumnWidth(15)
+ @ExcelProperty("警号*")
+ private String code;
- @ExcelProperty("角色名称")
- private String roleName;
+ @ColumnWidth(10)
+ @ExcelProperty("姓名*")
+ private String realName;
- @ExcelProperty("部门名称")
- private String deptName;
+ @ColumnWidth(15)
+ @ExcelProperty("联系电话")
+ private String phone;
- @ExcelProperty("岗位名称")
- private String postName;
+ @ExcelProperty("性别*")
+ private String sex;
- @ColumnWidth(20)
- @ExcelProperty("生日")
- private Date birthday;
+ @ExcelProperty("身份证号*")
+ private String cardid;
+
}
--
Gitblit v1.9.3