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/record/entity/Record.java | 34 +++++++++++++++++++++++++++++++++- 1 files changed, 33 insertions(+), 1 deletions(-) diff --git a/src/main/java/org/springblade/modules/record/entity/Record.java b/src/main/java/org/springblade/modules/record/entity/Record.java index e796d9f..02cd6e1 100644 --- a/src/main/java/org/springblade/modules/record/entity/Record.java +++ b/src/main/java/org/springblade/modules/record/entity/Record.java @@ -154,13 +154,45 @@ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date permitime; private String approve; - private String examinetime; private String cardid; private String representativecell; private String contacts; private String contactscell; private String storage; private String jurisdiction; + //派出所审批 + private String papprove; + //县审批 + private String xapprove; + //市审批 + private String sapprove; + //派出意见 + private String popinion; + //县意见 + private String xopinion; + //市意见 + private String sopinion; + + @ApiModelProperty(value = "审批时间") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date overtime; + + + @ApiModelProperty(value = "派出所审批时间") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date ptime; + + @ApiModelProperty(value = "县审批时间") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date stime; + + @ApiModelProperty(value = "市审批时间") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date xtime; } -- Gitblit v1.9.3