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/recordk/dto/RecordkDTO.java | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 102 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/recordk/dto/RecordkDTO.java b/src/main/java/org/springblade/modules/recordk/dto/RecordkDTO.java
index 6917870..1b989f7 100644
--- a/src/main/java/org/springblade/modules/recordk/dto/RecordkDTO.java
+++ b/src/main/java/org/springblade/modules/recordk/dto/RecordkDTO.java
@@ -16,9 +16,17 @@
*/
package org.springblade.modules.recordk.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.springblade.modules.licetuser.entity.Licetuser;
import org.springblade.modules.recordk.entity.Recordk;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
/**
* 数据传输对象实体类
@@ -27,8 +35,100 @@
* @since 2021-07-12
*/
@Data
-@EqualsAndHashCode(callSuper = true)
-public class RecordkDTO extends Recordk {
+public class RecordkDTO implements Serializable {
private static final long serialVersionUID = 1L;
+ private Integer id;
+
+ private String ptype;
+
+ /**
+ * 审核状态
+ */
+ private String type;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date permitime;
+
+ private String cardid;
+
+ private String representativecell;
+
+ private String contacts;
+
+ private String contactscell;
+
+ private String jurisdiction;
+
+ /**
+ * 登记机关
+ */
+ private String registration;
+
+ /**
+ * 所属行业
+ */
+ private String industry;
+
+ /**
+ * 统一社会信用代码
+ */
+ private String creditcode;
+ /**
+ * 企业名称
+ */
+ private String enterprisename;
+ /**
+ * 法定代表人
+ */
+ private String representative;
+ /**
+ * 注册地址
+ */
+ private String address;
+
+ /**
+ * 保安服务单位许可编号
+ */
+ private String perid;
+ /**
+ * 许可发证机关
+ */
+ private String offices;
+
+ /**
+ * 最后审批时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date overtime;
+
+ /**
+ * 发证时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date officetime;
+
+ @ApiModelProperty(value = "保安人数")
+ private Integer ksecuritys;
+
+ @ApiModelProperty(value = "拟跨区域经营的保安服务项目")
+ private String kproject;
+
+ @ApiModelProperty(value = "邮编")
+ private String kzipcode;
+
+ @ApiModelProperty(value = "跨区域经营服务时间（备案有效期）")
+ private String kservicetime;
+
+ @ApiModelProperty(value = "地址")
+ private String kaddress;
+
+ /**
+ * 材料集合信息
+ */
+ private List<Licetuser> licetusers;
+
}
--
Gitblit v1.9.3