From cd7bec2448443f88eee6f73df68df829fc95eed9 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 29 六月 2021 11:25:24 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksDetailsVO.java | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksDetailsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksDetailsVO.java
index 3e5ac76..f5a206a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksDetailsVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksDetailsVO.java
@@ -2,6 +2,11 @@
import com.alibaba.fastjson.JSONObject;
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.dtos.EventResourceDTO;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import com.panzhihua.common.model.vos.grid.EventResourceVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -19,18 +24,23 @@
* */
@Data
@ApiModel("重点人群走访记录详细返回参数")
+@EncryptDecryptClass
public class EventVisitingTasksDetailsVO {
@ApiModelProperty(value = "id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty(value = "网格员所处的街道")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long gridMemberStreet;
@ApiModelProperty(value = "网格员所处社区")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long gridMemberCommunity;
@ApiModelProperty(value = "网格员")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long gridMember;
@ApiModelProperty(value = "网格员名字")
@@ -40,6 +50,7 @@
private String gridMenberTele;
@ApiModelProperty(value = "需走访人ID")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long visiterId;
@ApiModelProperty(value = "需走访人名字")
@@ -49,6 +60,7 @@
private Integer visiterSex;
@ApiModelProperty(value = "需走访人电话")
+ @EncryptDecryptField
private String visiterTele;
@ApiModelProperty(value = "需走访人居住地址")
@@ -89,6 +101,7 @@
private Integer dellType;
@ApiModelProperty(value = "处理人ID")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long dellUserId;
@ApiModelProperty(value = "处理人名称")
@@ -98,7 +111,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date dellDate;
- @ApiModelProperty(value = "解决人针对解决事件的处理描述")
+ @ApiModelProperty(value = "异常描述")
private String dellDesc;
@ApiModelProperty(value = "是否有效")
@@ -114,13 +127,14 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date submitDate;
- @ApiModelProperty(value = "是否异常行为")
+ @ApiModelProperty(value = "是否异常行为:0否，1是")
private Boolean exception;
@ApiModelProperty(value = "走访内容根据重点人员类型输入项不同，录入全部的表单内容数据")
private JSONObject tableContentJson;
@ApiModelProperty(value = "创建人")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long createBy;
@ApiModelProperty(value = "创建事件")
@@ -128,6 +142,7 @@
private Date createAt;
@ApiModelProperty(value = "修改人")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long updateBy;
@ApiModelProperty(value = "修改时间")
@@ -138,13 +153,30 @@
private List<String> optionList;
@ApiModelProperty(value = "音频列表")
- List<String> vosList;
+ List<EventResourceDTO> vosList;
@ApiModelProperty(value = "图片列表")
- List<String> imgList;
+ List<EventResourceDTO> imgList;
@ApiModelProperty(value = "视频列表")
- List<String> videoList;
+ List<EventResourceDTO> videoList;
+ @ApiModelProperty(value = "家庭联系方式")
+ private String familyPhone;
+
+ @ApiModelProperty(value = "生活来源")
+ private String familySource;
+
+ @ApiModelProperty(value = "地址备注")
+ private String addressRemark;
+
+ @ApiModelProperty(value = "备注")
+ private String remark;
+
+ @ApiModelProperty("异常选择")
+ private String option;
+
+ @ApiModelProperty("走访后的经纬度（,隔开）")
+ private String latLng;
}
--
Gitblit v1.7.1