From 78cd6f6cd83cf4a891c5b8aa7d023e3125a2698f Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 12 十月 2022 19:59:49 +0800
Subject: [PATCH] 三说会堂事件流程处理
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEvent.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEvent.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEvent.java
index b5713ba..e35bd9e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEvent.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEvent.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.model.vos.sanshuo.ComEventRequestImageVO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -52,9 +53,11 @@
private String type;
/**上报提交时间*/
@ApiModelProperty(name = "submitDate", value = "上报提交时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date submitDate;
/**选择预约调解时间*/
@ApiModelProperty(name = "appointmentTime", value = "选择预约调解时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date appointmentTime;
/**申请人选择的社区ID*/
@ApiModelProperty(name = "requestUserCommunity", value = "申请人选择的社区ID")
@@ -82,6 +85,7 @@
private String specialistTel;
/**专家受理时间*/
@ApiModelProperty(name = "specialistAcceptTime", value = "专家受理时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date specialistAcceptTime;
/**撤销类型 1 用户 2 社区3、街道4、行业分中心*/
@ApiModelProperty(name = "revokeType", value = "撤销类型 1 用户 2 社区3、街道4、行业分中心")
@@ -89,7 +93,7 @@
/**工作人员的事件处理状态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、区）*/
+ /**当前处理对象类型（1、行业分中心2、社区3、是街道4、区三说会堂,5专家）*/
@ApiModelProperty(name = "currentProcessType", value = "当前处理对象类型（1、行业分中心2、社区3、是街道4、区）")
private Integer currentProcessType;
/**当前处理机构ID*/
@@ -110,7 +114,7 @@
/**当前调解处理结果*/
@ApiModelProperty(name = "currentEventProcessResult", value = "当前调解处理结果")
private String currentEventProcessResult;
- /**调解是否成果1未成果2已成果*/
+ /**调解是否成果1未成功2已成果*/
@ApiModelProperty(name = "eventSucceed", value = "调解是否成果1未成功2已成功")
private Integer eventSucceed;
/**事件结果（1、调解失败2、调解成功）*/
@@ -124,6 +128,7 @@
private String result;
/**已归档处理完毕时间*/
@ApiModelProperty(name = "resultDate", value = "已归档处理完毕时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date resultDate;
/**是否紧急*/
@ApiModelProperty(name = "urgent", value = "是否紧急")
@@ -148,6 +153,7 @@
private Long createBy;
/**创建时间*/
@ApiModelProperty(name = "createAt", value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date createAt;
/**修改人*/
@ApiModelProperty(name = "updateBy", value = "修改人")
@@ -161,4 +167,23 @@
private List<ComEventRequestImageVO> images;
@TableField(exist = false)
private String icon;
+ /**调解事件类型*/
+ @TableField(exist = false)
+ private String eventCategoryName;
+ @TableField(exist = false)
+ private String keyword;
+ @TableField(exist = false)
+ private Integer userType;
+ @ApiModelProperty("取消时间")
+ private Date revokeDate;
+ @ApiModelProperty("专家头像")
+ @TableField(exist = false)
+ private String expertAvatar;
+ @ApiModelProperty("社区id")
+ @TableField(exist = false)
+ private Long communityId;
+ @ApiModelProperty("上报等级,4专家上报到社区，3专家上报到行业分中心，2社区上报到街道，1街道上报到三说会堂5行业分中心上报到三说会堂")
+ private Integer reportLevel;
+ @TableField(exist = false)
+ private Integer isArchive;
}
--
Gitblit v1.7.1