From bddad8b22f9b505274a8c2904d9d81efda89f497 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 20 十月 2022 13:08:36 +0800
Subject: [PATCH] Merge branch 'local_20221014' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComElderAuthRecordVO.java | 75 +++++++++++++++++++++++++++++++++++--
1 files changed, 71 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComElderAuthRecordVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComElderAuthRecordVO.java
index 2af65d3..2b87c56 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComElderAuthRecordVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComElderAuthRecordVO.java
@@ -1,9 +1,14 @@
package com.panzhihua.common.model.vos.community;
import java.util.Date;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,6 +26,7 @@
public class ComElderAuthRecordVO {
@ApiModelProperty(value = "自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty(value = "高龄老人id")
@@ -29,19 +35,60 @@
@ApiModelProperty(value = "认证期数")
private String authPeriod;
- @ApiModelProperty(value = "提交用户")
+ @ApiModelProperty(value = "提交用户id")
private Long submitUserId;
+
+ @ApiModelProperty(value = "认证方式（1.视频认证 2.人脸认证）")
+ private Integer authMethod;
+
+ @ApiModelProperty(value = "提交用户姓名")
+ private String submitUserName;
+
+ @ApiModelProperty(value = "联系电话")
+ private String phone;
+
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ @ApiModelProperty(value = "身份证号")
+ @EncryptDecryptField
+ private String idCard;
+
+ @ApiModelProperty(value = "性别（1.男 2.女 3.其他）")
+ private String sex;
+
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+ @ApiModelProperty(value = "出生日期")
+ private String birthday;
+
+ @ApiModelProperty(value = "人员类别（1.80-89周岁 2.90-99周岁 3.100周岁（含）以上）")
+ private Integer personnelCategory;
+
+ @ApiModelProperty(value = "是否高龄老人登记（1.是 0.否）")
+ private Integer isRegister;
+
+ @ApiModelProperty(value = "是否健在（1.是 0.否）")
+ private Integer isAlive;
+
+ @ApiModelProperty(value = "居住地址")
+ private String address;
@ApiModelProperty(value = "认证视频url")
private String authVideo;
- @ApiModelProperty(value = "审核人员")
- private String approver;
+ @ApiModelProperty(value = "审核人员id")
+ private Long approverId;
+
+ @ApiModelProperty(value = "审核人员姓名")
+ private String approverName;
@ApiModelProperty(value = "审核状态（1.待审核 2.驳回 3.通过）")
private Integer approvalStatus;
@ApiModelProperty(value = "审核时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date approvalDate;
@ApiModelProperty(value = "标记")
@@ -51,14 +98,34 @@
private String rejectReason;
@ApiModelProperty(value = "认证状态")
- private Boolean authStatus;
+ private Integer authStatus;
@ApiModelProperty(value = "认证时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date authDate;
@ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
@ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateAt;
+
+ @ApiModelProperty(value = "本期认证总人数")
+ private Integer authAmount;
+
+ @ApiModelProperty(value = "本期认证成功人数")
+ private Integer authSucceedAmount;
+
+ @ApiModelProperty(value = "本期未认证人数")
+ private Integer authNoAmount;
+
+ @ApiModelProperty(value = "待审核状态id集合列表")
+ private List<String> nextIds;
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ private String areaCode;
}
--
Gitblit v1.7.1