From b1e9f850ffa9406c7df90d9cb9fd6dc0b7446202 Mon Sep 17 00:00:00 2001 From: xyh <18782104331@139.com> Date: 星期四, 24 六月 2021 18:30:24 +0800 Subject: [PATCH] 联调修改 --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksVO.java | 201 ++++++++++++++++++++++++++------------------------ 1 files changed, 104 insertions(+), 97 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksVO.java index 884fd4e..8f460d2 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksVO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksVO.java @@ -78,53 +78,53 @@ @ApiModelProperty(value = "需走访人ID") private Long visiterId; -// @ApiModelProperty(value = "网格员所处的街道") -// private Long gridMemberStreet; -// -// @ApiModelProperty(value = "网格员所处社区") -// private Long gridMemberCommunity; -// -// @ApiModelProperty(value = "网格员") -// private Long gridMember; -// -// @ApiModelProperty(value = "网格员名字") -// private String gridMemberName; -// -// @ApiModelProperty(value = "网格员联系方式") -// private String gridMenberTele; -// -// -// @ApiModelProperty(value = "需走访人员性别") -// private Integer visiterSex; -// -// @ApiModelProperty(value = "需走访人电话") -// private String visiterTele; -// -// + @ApiModelProperty(value = "网格员所处的街道") + private Long gridMemberStreet; + + @ApiModelProperty(value = "网格员所处社区") + private Long gridMemberCommunity; + + @ApiModelProperty(value = "网格员") + private Long gridMember; + + @ApiModelProperty(value = "网格员名字") + private String gridMemberName; + + @ApiModelProperty(value = "网格员联系方式") + private String gridMenberTele; + + + @ApiModelProperty(value = "需走访人员性别") + private Integer visiterSex; + + @ApiModelProperty(value = "需走访人电话") + private String visiterTele; + + @ExcelIgnore private Integer visiterType; -// -// @ApiModelProperty(value = "事件标题") -// private String eventTitle; -// -// @ApiModelProperty(value = "事件类型") -// private Integer eventType; -// -// @ApiModelProperty(value = "事件描述") -// private String eventDes; -// -// @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)") -// private Integer actOpara; -// -// @ApiModelProperty(value = "发生时间") -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") -// private Date happenTime; -// -// @ApiModelProperty(value = "发生地点") -// private String happentAddress; -// -// @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）") -// private String happentLatLng; + + @ApiModelProperty(value = "事件标题") + private String eventTitle; + + @ApiModelProperty(value = "事件类型") + private Integer eventType; + + @ApiModelProperty(value = "事件描述") + private String eventDes; + + @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)") + private Integer actOpara; + + @ApiModelProperty(value = "发生时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date happenTime; + + @ApiModelProperty(value = "发生地点") + private String happentAddress; + + @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）") + private String happentLatLng; // @ExcelIgnore private Integer eventStatus; @@ -142,59 +142,66 @@ } return EventTasksVisitorTypeEnum.getName(visiterType); } -// -// @ApiModelProperty(value = "上报状态") -// private Integer reporting; -// -// @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）") -// private Integer dellType; -// -// @ApiModelProperty(value = "处理人ID") -// private Long dellUserId; -// -// -// -// @ApiModelProperty(value = "处理时间") -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") -// private Date dellDate; -// -// -// @ApiModelProperty(value = "解决人针对解决事件的处理描述") -// private String dellDesc; -// -// @ApiModelProperty(value = "是否有效") -// private Boolean invalid; -// -// @ApiModelProperty(value = "是否紧急") -// private Boolean urgent; -// -// @ApiModelProperty(value = "是否催办") -// private Boolean urgentDell; -// -// @ApiModelProperty(value = "上报提交时间") -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") -// private Date submitDate; -// -// @ApiModelProperty(value = "是否异常行为") -// private Boolean exception; -// -// @ApiModelProperty(value = "走访内容根据重点人员类型输入项不同，录入全部的表单内容数据") -// private String tableContentJson; -// -// @ApiModelProperty(value = "创建人id") -// private Long createBy; -// -// -// @ApiModelProperty(value = "修改人") -// private Long updateBy; -// -// @ApiModelProperty(value = "修改时间") -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") -// private Date updateAt; -// -// @ApiModelProperty(value = "标签") -// private String label; + @ApiModelProperty(value = "上报状态") + private Integer reporting; + + @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）") + private Integer dellType; + + @ApiModelProperty(value = "处理人ID") + private Long dellUserId; + + + + @ApiModelProperty(value = "处理时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date dellDate; + + + @ApiModelProperty(value = "解决人针对解决事件的处理描述") + private String dellDesc; + + @ApiModelProperty(value = "是否有效") + private Boolean invalid; + + @ApiModelProperty(value = "是否紧急") + private Boolean urgent; + + @ApiModelProperty(value = "是否催办") + private Boolean urgentDell; + + + @ApiModelProperty(value = "是否异常行为") + private Boolean exception; + + @ApiModelProperty(value = "走访内容根据重点人员类型输入项不同，录入全部的表单内容数据") + private String tableContentJson; + + @ApiModelProperty(value = "创建人id") + private Long createBy; + + + @ApiModelProperty(value = "修改人") + private Long updateBy; + + @ApiModelProperty(value = "修改时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date updateAt; + + @ApiModelProperty(value = "标签") + private String label; + + @ApiModelProperty(value = "年龄") + private Integer age; + + @ApiModelProperty(value = "电话") + private String phone; + + private Integer nationCode; + + @ApiModelProperty(value = "民族") + private String nation; } -- Gitblit v1.7.1