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/EventVisitListVO.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitListVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitListVO.java
index 12d7491..cbb30ae 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitListVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitListVO.java
@@ -1,6 +1,8 @@
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.enums.EventTasksVisitorTypeEnum;
import io.swagger.annotations.ApiModel;
@@ -18,6 +20,7 @@
public class EventVisitListVO {
@ApiModelProperty("id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("真实姓名")
@@ -27,9 +30,7 @@
private String cardNoStr;
@ApiModelProperty(value = "人员标签")
- private String visiterTypeName;
-
- private Integer visiterType;
+ private String label;
@ApiModelProperty(value = "年龄")
private Integer age;
@@ -70,12 +71,10 @@
private String eventStatusName;
public String getEventStatusName() {
-
- return EventTasksStatusEnum.getName(eventStatus);
- }
-
- public String getVisiterTypeName(){
- return EventTasksVisitorTypeEnum.getName(visiterType);
+ if(eventStatus != null){
+ return EventTasksStatusEnum.getName(eventStatus);
+ }
+ return null;
}
}
--
Gitblit v1.7.1