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/experience/entity/Experience.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/experience/entity/Experience.java b/src/main/java/org/springblade/modules/experience/entity/Experience.java
index be8ddde..62ffca8 100644
--- a/src/main/java/org/springblade/modules/experience/entity/Experience.java
+++ b/src/main/java/org/springblade/modules/experience/entity/Experience.java
@@ -71,8 +71,8 @@
*/
@ApiModelProperty(value = "入职时间")
@TableField("entryTime")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date entrytime;
/**
@@ -80,8 +80,8 @@
*/
@ApiModelProperty(value = "离职时间")
@TableField("departureTime")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date departuretime;
/**
@@ -106,5 +106,11 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
+ /**
+ * 保安员id
+ */
+ @TableField("securityId")
+ private String securityid;
+
}
--
Gitblit v1.9.3