From 2dcf4b9d75cc1b6613aea59cec4a0f9cc97f1c0e Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 05 七月 2021 13:15:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/AppVisitTasksVO.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/AppVisitTasksVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/AppVisitTasksVO.java
index 9a839b6..e6be7ed 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/AppVisitTasksVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/AppVisitTasksVO.java
@@ -1,7 +1,10 @@
package com.panzhihua.common.model.vos.visit;
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.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -16,36 +19,63 @@
*/
@ApiModel("app走访任务VO")
@Data
+@EncryptDecryptClass
public class AppVisitTasksVO implements Serializable {
private static final long serialVersionUID = -5758072851661612412L;
@ApiModelProperty("id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
+ @ApiModelProperty("需走访人id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long visiterId;
+
+ @ApiModelProperty("需走访人姓名")
+ private String visiterName;
+
@ApiModelProperty("网格员id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long gridMember;
@ApiModelProperty("网格员")
private String gridMemberName;
@ApiModelProperty("处理人id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long dellUserId;
@ApiModelProperty("处理人")
private String dellUserName;
@ApiModelProperty("需走访人电话")
+ @EncryptDecryptField
private String visiterTele;
@ApiModelProperty("完成时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date submitDate;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("创建人")
+ private String creator;
+
+ @ApiModelProperty("撤销时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date cancelTime;
+
private Integer eventStatus;
@ApiModelProperty("状态")
private String eventStatusName;
+ @ApiModelProperty("正常状态（0.正常 1.异常）")
+ private Integer exception;
+
public String getEventStatusName() {
return EventTasksStatusEnum.getName(eventStatus);
--
Gitblit v1.7.1