From ad723be9b0bd0977619caf5ce31b91d04116c70e Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 07 七月 2021 10:57:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/query/visit/EventTasksQuery.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/query/visit/EventTasksQuery.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/query/visit/EventTasksQuery.java
index 0f7c69e..4adb9c4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/query/visit/EventTasksQuery.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/query/visit/EventTasksQuery.java
@@ -11,15 +11,18 @@
* @author xyh
* @date 2021/6/21 15:44
*/
-@ApiModel("走访任务查询")
+@ApiModel("走访查询")
@Data
public class EventTasksQuery extends PageDTO implements Serializable {
- @ApiModelProperty("状态:0全部，1已完成，2未完成")
+ @ApiModelProperty("走访任务状态，app：0全部，1待走访，2已完成 | 后台：0全部，1待走访 3正常，6已撤销，7异常")
private Integer status;
+ @ApiModelProperty("走访记录状态，app：0全部，3正常，7异常")
+ private Integer eventStatus;
+
@ApiModelProperty("人员标签")
- private Integer tag;
+ private String tag;
@ApiModelProperty("是否异常")
private Integer isExp;
@@ -31,4 +34,9 @@
private Long visiterId;
private Long communityId;
+
+ private Long userId;
+
+ @ApiModelProperty("正常状态（0.正常 1.异常）")
+ private Integer exception;
}
--
Gitblit v1.7.1