From cf2e6ce54f82c61606a01f816f7cac8b3a967809 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 30 六月 2021 18:07:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksVO.java | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 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 943d7a4..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,8 +1,10 @@
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;
@@ -22,72 +24,77 @@
* */
@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 = "网格员所处的街道")
+ @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 = "网格员名字")
@@ -105,7 +112,6 @@
private String visiterTele;
- @ExcelIgnore
private Integer visiterType;
@ApiModelProperty(value = "事件标题")
@@ -129,8 +135,6 @@
@ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）")
private String happentLatLng;
-//
- @ExcelIgnore
private Integer eventStatus;
public String getEventStatusName() {
@@ -154,6 +158,7 @@
private Integer dellType;
@ApiModelProperty(value = "处理人ID")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long dellUserId;
@@ -183,10 +188,12 @@
private String tableContentJson;
@ApiModelProperty(value = "创建人id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long createBy;
@ApiModelProperty(value = "修改人")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long updateBy;
@ApiModelProperty(value = "修改时间")
--
Gitblit v1.7.1