From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventVisitingTasksVO.java | 92 +++++++++++++++++++++++-----------------------
1 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventVisitingTasksVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventVisitingTasksVO.java
index 485c11e..5060c29 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventVisitingTasksVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventVisitingTasksVO.java
@@ -1,11 +1,12 @@
package com.panzhihua.common.model.vos.grid;
-import java.util.*;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
/**
*
@@ -13,123 +14,122 @@
* @version 1.0
* @since 1.0
* @date 2021-05-26
- * */
+ */
@Data
@ApiModel("重点人群走访记录返回参数")
public class EventVisitingTasksVO {
@ApiModelProperty(value = "id")
- private Long id;
+ private Long id;
@ApiModelProperty(value = "网格员所处的街道")
- private Long gridMemberStreet;
+ private Long gridMemberStreet;
@ApiModelProperty(value = "网格员所处社区")
- private Long gridMemberCommunity;
+ private Long gridMemberCommunity;
@ApiModelProperty(value = "网格员")
- private Long gridMember;
+ 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;
+ private Long visiterId;
@ApiModelProperty(value = "需走访人名字")
- private String visiterName;
+ private String visiterName;
@ApiModelProperty(value = "需走访人员性别")
- private Integer visiterSex;
+ private Integer visiterSex;
@ApiModelProperty(value = "需走访人电话")
- private String visiterTele;
+ private String visiterTele;
@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;
+ 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;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date dellDate;
@ApiModelProperty(value = "解决人针对解决事件的处理描述")
- private String dellDesc;
+ 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;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date submitDate;
@ApiModelProperty(value = "是否异常行为")
- private Boolean exception;
+ private Boolean exception;
@ApiModelProperty(value = "走访内容根据重点人员类型输入项不同，录入全部的表单内容数据")
- private String tableContentJson;
+ private String tableContentJson;
@ApiModelProperty(value = "创建人")
- private Long createBy;
+ 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;
+ private Long updateBy;
@ApiModelProperty(value = "修改时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date updateAt;
-
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
}
--
Gitblit v1.7.1