From f8466a8905261edc14c3d8015748a9a617d8fe3c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 28 七月 2021 11:10:13 +0800
Subject: [PATCH] 修改综治后台关联市平台网格员以及网格接口
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventTransferRecordVO.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventTransferRecordVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventTransferRecordVO.java
index c811d71..67a7824 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventTransferRecordVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventTransferRecordVO.java
@@ -1,5 +1,6 @@
package com.panzhihua.common.model.vos.community.screen.event;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -11,8 +12,36 @@
public class EventTransferRecordVO {
@ApiModelProperty("事件处理时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date processDate;
@ApiModelProperty("事件处理结果")
- private Date processResult;
+ private String processResult;
+
+ @ApiModelProperty("业务处理类型 1 网格员处理 2 派发到社区 3 社区处理 4 社区标为无效 5 标为无效后处理 6 验证 7 撤销 8 重新发布已撤销事件 9 社区重新发布已标为无效的事件")
+ private Integer processType;
+
+ @ApiModelProperty("事件处理人")
+ private String fromName;
+
+ @ApiModelProperty(value = "来源类型（1、网格员2、社区3、是街道）",hidden = true)
+ private Integer fromType;
+
+ @ApiModelProperty(value = "事件来源机构或网格员",hidden = true)
+ private Long fromId;
+
+ @ApiModelProperty("上级关系")
+ private String superiorRelationship;
+
+ @ApiModelProperty(value = "事件id",hidden = true)
+ private Long eventId;
+
+ /**
+ * 来源类型（1、网格员2、社区3、是街道）
+ */
+ public interface fromType{
+ int wgy = 1;
+ int sq = 2;
+ int jd = 3;
+ }
}
--
Gitblit v1.7.1