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/EventVisitingTasksVO.java | 246 ++++++++++++++++++++++++++----------------------
1 files changed, 132 insertions(+), 114 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..491d06d 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
@@ -1,10 +1,14 @@
package com.panzhihua.common.model.vos.visit;
-import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
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.enums.EventTasksStatusEnum;
import com.panzhihua.common.enums.EventTasksVisitorTypeEnum;
+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;
@@ -20,113 +24,117 @@
* */
@Data
@ApiModel("重点人群走访记录返回参数")
+@ExcelIgnoreUnannotated
+@EncryptDecryptClass
public class EventVisitingTasksVO {
@ApiModelProperty(value = "id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
- @ExcelProperty(value = "序号",index = 0)
- private Integer rowNum;
+// @ExcelProperty(value = "序号",index = 0)
+// private Integer rowNum;
- @ExcelProperty(value = "创建时间",index = 1)
+ @ExcelProperty(value = "创建时间",index = 0)
@ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
- @ExcelProperty(value = "创建人",index = 2)
+ @ExcelProperty(value = "创建人",index = 1)
@ApiModelProperty(value = "创建人")
private String creator;
- @ExcelProperty(value = "走访对象",index = 3)
+ @ExcelProperty(value = "走访对象",index = 2)
@ApiModelProperty(value = "需走访人名字")
private String visiterName;
- @ExcelProperty(value = "身份证号码",index = 4)
+ @ExcelProperty(value = "身份证号码",index = 3)
@ApiModelProperty(value = "身份证号码")
private String cardNoStr;
- @ExcelProperty(value = "走访地址",index = 5)
+ @ExcelProperty(value = "走访地址",index = 4)
@ApiModelProperty(value = "走访地址")
private String visiterAddress;
- @ExcelProperty(value = "人员标签",index = 6)
+ @ExcelProperty(value = "人员标签",index = 5)
@ApiModelProperty(value = "人员标签")
private String visiterTypeName;
- @ExcelProperty(value = "走访人",index = 7)
+ @ExcelProperty(value = "走访人",index = 6)
@ApiModelProperty(value = "走访人")
private String dellUserName;
- @ExcelProperty(value = "完成走访时间",index = 8)
+ @ExcelProperty(value = "完成走访时间",index = 7)
@ApiModelProperty(value = "完成走访时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date submitDate;
- @ExcelProperty(value = "撤销时间",index = 9)
+ @ExcelProperty(value = "撤销时间",index = 8)
@ApiModelProperty(value = "撤销时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date cancelTime;
- @ExcelProperty(value = "状态",index = 10)
+ @ExcelProperty(value = "状态",index = 9)
@ApiModelProperty(value = "状态")
private String eventStatusName;
- @ExcelIgnore
@ApiModelProperty(value = "需走访人ID")
+ @JsonSerialize(using = ToStringSerializer.class)
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;
-//
-//
- @ExcelIgnore
+ @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 = "网格员名字")
+ private String gridMemberName;
+
+ @ApiModelProperty(value = "网格员联系方式")
+ private String gridMenberTele;
+
+
+ @ApiModelProperty(value = "需走访人员性别")
+ private Integer visiterSex;
+
+ @ApiModelProperty(value = "需走访人电话")
+ @EncryptDecryptField
+ private String visiterTele;
+
+
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;
-//
- @ExcelIgnore
+
+ @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;
private Integer eventStatus;
public String getEventStatusName() {
@@ -142,59 +150,69 @@
}
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")
+ @JsonSerialize(using = ToStringSerializer.class)
+ 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")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long createBy;
+
+
+ @ApiModelProperty(value = "修改人")
+ @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 = "标签")
+ 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