From 7b18addebfc5e39cbd0318790daee8f97c89ba25 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 28 十一月 2022 12:22:48 +0800
Subject: [PATCH] #feat 新增商品上下架商品数量
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksDetailsVO.java | 175 ++++++++++++++++++++++++++++------------------------------
1 files changed, 84 insertions(+), 91 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 b3a6b85..70291c6 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
@@ -1,15 +1,19 @@
package com.panzhihua.common.model.vos.visit;
+import java.util.Date;
+import java.util.List;
+
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.vos.grid.EventResourceVO;
+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;
-
-import java.util.Date;
-import java.util.List;
/**
*
@@ -17,135 +21,124 @@
* @version 1.0
* @since 1.0
* @date 2021-05-26
- * */
+ */
@Data
@ApiModel("重点人群走访记录详细返回参数")
+@EncryptDecryptClass
public class EventVisitingTasksDetailsVO {
+ @ApiModelProperty(value = "音频列表")
+ List<EventResourceDTO> vosList;
+ @ApiModelProperty(value = "图片列表")
+ List<EventResourceDTO> imgList;
+ @ApiModelProperty(value = "视频列表")
+ List<EventResourceDTO> videoList;
@ApiModelProperty(value = "id")
- private Long id;
-
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
@ApiModelProperty(value = "网格员所处的街道")
- private Long gridMemberStreet;
-
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long gridMemberStreet;
@ApiModelProperty(value = "网格员所处社区")
- private Long gridMemberCommunity;
-
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long gridMemberCommunity;
@ApiModelProperty(value = "网格员")
- private Long gridMember;
-
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long gridMember;
@ApiModelProperty(value = "网格员名字")
- private String gridMemberName;
-
+ private String gridMemberName;
@ApiModelProperty(value = "网格员联系方式")
- private String gridMenberTele;
-
+ private String gridMenberTele;
@ApiModelProperty(value = "需走访人ID")
- private Long visiterId;
-
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long visiterId;
@ApiModelProperty(value = "需走访人名字")
- private String visiterName;
-
+ private String visiterName;
@ApiModelProperty(value = "需走访人员性别")
- private Integer visiterSex;
-
+ private Integer visiterSex;
@ApiModelProperty(value = "需走访人电话")
- private String visiterTele;
-
+ @EncryptDecryptField
+ private String visiterTele;
+ @ApiModelProperty(value = "需走访人电话")
+ private String visiterPhone;
@ApiModelProperty(value = "需走访人居住地址")
- private String visiterAddress;
-
+ private String visiterAddress;
@ApiModelProperty(value = "人员类型1吸毒2严重精神障碍3刑释人员4社区矫正人员")
- private Integer visiterType;
-
+ private Integer visiterType;
@ApiModelProperty(value = "事件标题")
- private String eventTitle;
-
+ private String eventTitle;
@ApiModelProperty(value = "事件类型")
- private Integer eventType;
-
+ private Integer eventType;
@ApiModelProperty(value = "事件描述")
- private String eventDes;
-
+ private String eventDes;
@ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)")
- private Integer actOpara;
-
+ private Integer actOpara;
@ApiModelProperty(value = "发生时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date happenTime;
-
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date happenTime;
@ApiModelProperty(value = "发生地点")
- private String happentAddress;
-
+ private String happentAddress;
@ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）")
- private String happentLatLng;
-
+ private String happentLatLng;
@ApiModelProperty(value = "事件状态（1待处理2自己已解决3待验证4草稿箱5已撤销6异常）")
- private Integer eventStatus;
-
+ private Integer eventStatus;
@ApiModelProperty(value = "上报状态")
- private Integer reporting;
-
+ private Integer reporting;
@ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）")
- private Integer dellType;
-
+ private Integer dellType;
@ApiModelProperty(value = "处理人ID")
- private Long dellUserId;
-
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long dellUserId;
@ApiModelProperty(value = "处理人名称")
- private String dellUserName;
-
+ private String dellUserName;
@ApiModelProperty(value = "处理时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date dellDate;
-
- @ApiModelProperty(value = "解决人针对解决事件的处理描述")
- private String dellDesc;
-
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date dellDate;
+ @ApiModelProperty(value = "异常描述")
+ private String dellDesc;
@ApiModelProperty(value = "是否有效")
- private Boolean invalid;
-
+ private Boolean invalid;
@ApiModelProperty(value = "是否紧急")
- private Boolean urgent;
-
+ private Boolean urgent;
@ApiModelProperty(value = "是否催办")
- private Boolean urgentDell;
-
+ private Boolean urgentDell;
@ApiModelProperty(value = "上报提交时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date submitDate;
-
- @ApiModelProperty(value = "是否异常行为")
- private Boolean exception;
-
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date submitDate;
+ @ApiModelProperty(value = "是否异常行为:0否，1是")
+ private Integer exception;
@ApiModelProperty(value = "走访内容根据重点人员类型输入项不同，录入全部的表单内容数据")
- private JSONObject tableContentJson;
-
+ private JSONObject tableContentJson;
@ApiModelProperty(value = "创建人")
- private Long createBy;
-
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long createBy;
@ApiModelProperty(value = "创建事件")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date createAt;
-
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
@ApiModelProperty(value = "修改人")
- private Long updateBy;
-
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long updateBy;
@ApiModelProperty(value = "修改时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date updateAt;
-
- @ApiModelProperty(value = "异常选项")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+ @ApiModelProperty(value = "异常选项")
private List<String> optionList;
+ @ApiModelProperty(value = "家庭联系方式")
+ private String familyPhone;
- @ApiModelProperty(value = "音频列表")
- List<EventResourceDTO> vosList;
+ @ApiModelProperty(value = "生活来源")
+ private String familySource;
- @ApiModelProperty(value = "图片列表")
- List<EventResourceDTO> imgList;
+ @ApiModelProperty(value = "地址备注")
+ private String addressRemark;
- @ApiModelProperty(value = "视频列表")
- List<EventResourceDTO> videoList;
+ @ApiModelProperty(value = "备注")
+ private String remark;
+ @ApiModelProperty("异常选择")
+ private String option;
+
+ @ApiModelProperty("走访后的经纬度（,隔开）")
+ private String latLng;
}
--
Gitblit v1.7.1