From c60eea0ab4d74ab8f39a33f896e978dc591f1800 Mon Sep 17 00:00:00 2001 From: yanghui <2536613402@qq.com> Date: 星期一, 10 十月 2022 12:11:47 +0800 Subject: [PATCH] Merge branch 'local_20221010' into huacheng_test --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventVO.java | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventVO.java index 62d09a9..ea2c8ea 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventVO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventVO.java @@ -1,5 +1,6 @@ package com.panzhihua.common.model.vos.sanshuo; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -79,7 +80,7 @@ @ApiModelProperty(name = "revokeType", value = "撤销类型 1 用户 2 社区3、街道4、行业分中心") private Integer revokeType; /**工作人员的事件处理状态1待处理2待验证3专家已受理4专家未受理，拒绝5调解中6已结案归档7调解取消*/ - @ApiModelProperty(name = "eventProcessStatus", value = "工作人员的事件处理状态1待处理2待验证3专家已受理4专家未受理，拒绝5调解中6已结案归档7调解取消") + @ApiModelProperty(name = "eventProcessStatus", value = "工作人员的事件处理状态1待处理2待验证3专家已受理4专家未受理，拒绝5调解中6已结案7已归档8调解取消9已删除") private Integer eventProcessStatus; /**当前处理对象类型（1、行业分中心2、社区3、是街道4、区）*/ @ApiModelProperty(name = "currentProcessType", value = "当前处理对象类型（1、行业分中心2、社区3、是街道4、区）") @@ -93,6 +94,13 @@ /**当前机构下处理人名称*/ @ApiModelProperty(name = "currentProcessUserName", value = "当前机构下处理人名称") private String currentProcessUserName; + /**当前调解处理结果*/ + @ApiModelProperty(name = "currentEventProcessResult", value = "当前调解处理结果") + private String currentEventProcessResult; + /**调解是否成果1未成果2已成果*/ + @ApiModelProperty(name = "eventSucceed", value = "调解是否成果1未成果2已成果") + private Integer eventSucceed; + /**撤销描述*/ @ApiModelProperty(name = "revokeDes", value = "撤销描述") private String revokeDes; @@ -131,6 +139,7 @@ private Long createBy; /**创建时间*/ @ApiModelProperty(name = "createAt", value = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createAt; /**修改人*/ @ApiModelProperty(name = "updateBy", value = "修改人") @@ -138,5 +147,10 @@ /**修改时间*/ @ApiModelProperty(name = "updateAt", value = "修改时间") private Date updateAt; - + + private Long pageNo; + private Long pageSize; + private String keyword; + @ApiModelProperty(value = "查看类型1用户查看自己的调解事件申请2专家查看自己受理的调解事件") + private Integer userType; } -- Gitblit v1.7.1