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/dispatcher/entity/Dispatcher.java | 73 ++++++++++++++++++++++++++++++++++--
1 files changed, 68 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java b/src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java
index 2499d69..c7f6ba1 100644
--- a/src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java
+++ b/src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java
@@ -22,10 +22,14 @@
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* 实体类
@@ -58,11 +62,13 @@
@ApiModelProperty(value = "派遣人")
private String dispatcher;
/**
- * 派遣时间
+ * 派遣开始时间
*/
- @ApiModelProperty(value = "派遣时间")
+ @ApiModelProperty(value = "派遣开始时间")
@TableField("dispatcherTime")
- private LocalDateTime dispatchertime;
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date dispatchertime;
/**
* 派遣地址
*/
@@ -73,8 +79,65 @@
* 派遣地址
*/
@ApiModelProperty(value = "派遣单位")
- @TableField("dispatcherCompany")
- private String dispatchercompany;
+ @TableField("dispatcher_unit_id")
+ private String dispatcherUnitId;
+ /**
+ * 派遣保安ids
+ */
+ @TableField("user_ids")
+ private String userIds;
+
+
+ /**
+ * 派遣结束时间
+ */
+ @TableField("end_time")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date endTime;
+
+
+ /**
+ * 保安公司(组织机构)id
+ */
+ @TableField("dept_id")
+ private Long deptId;
+
+ /**
+ * 辖区
+ */
+ private String jurisdiction;
+
+
+ /**
+ * 派遣人数
+ */
+ private Integer num;
+
+ /**
+ * 创建时间
+ */
+ @TableField("create_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+
+
+ /**
+ * 更新时间
+ */
+ @TableField("update_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+
+ /**
+ * 派遣状态 0：已派遣 1：派遣结束
+ */
+ private Integer status;
+
}
--
Gitblit v1.9.3