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/social/excel/SocialExcel.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/springblade/modules/social/excel/SocialExcel.java b/src/main/java/org/springblade/modules/social/excel/SocialExcel.java
index 718d338..575887b 100644
--- a/src/main/java/org/springblade/modules/social/excel/SocialExcel.java
+++ b/src/main/java/org/springblade/modules/social/excel/SocialExcel.java
@@ -17,6 +17,7 @@
package org.springblade.modules.social.excel;
import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
@@ -38,26 +39,28 @@
private static final long serialVersionUID = 1L;
@ColumnWidth(15)
- @ExcelProperty("姓名")
+ @ExcelProperty("姓名*")
private String namb;
@ColumnWidth(10)
- @ExcelProperty("性别")
+ @ExcelProperty("性别*")
private String sex;
@ColumnWidth(15)
@ExcelProperty("民族")
private String nation;
- @ColumnWidth(15)
- @ExcelProperty("出生日期")
+ @ColumnWidth(20)
+ @ExcelProperty("出生日期*")
+ @DateTimeFormat("yyyy/MM/dd")
private Date birthday;
@ColumnWidth(15)
- @ExcelProperty("联系电话")
+ @ExcelProperty("联系电话*")
private String telephone;
- @ExcelProperty("身份证号")
+ @ColumnWidth(20)
+ @ExcelProperty("身份证号*")
private String cardid;
@ColumnWidth(15)
@@ -70,12 +73,11 @@
@ExcelProperty("户籍性质")
private String nature;
- @ExcelProperty("个人缴费")
+ @ExcelProperty("个人缴费*")
private String amount ;
- @ExcelProperty("参保时间")
+ @ExcelProperty("参保时间*")
+ @DateTimeFormat("yyyy/MM/dd")
private Date insuredtime;
-
-
}
--
Gitblit v1.9.3