From ffb18ccfe6750f4a65bce6e02e7f6edb54a5d76f Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期六, 24 九月 2022 23:45:38 +0800
Subject: [PATCH] [修改] 三说代码事件流程代码提交

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEvent.java |   31 ++++++++++++++++++++++++++++---
 1 files changed, 28 insertions(+), 3 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 7cdfb1c..99db91c 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
@@ -1,11 +1,16 @@
 package com.panzhihua.service_community.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.panzhihua.common.model.vos.sanshuo.ComEventRequestImageVO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Date;
+import java.util.List;
 
 /**
  * Description 三说会堂事件表
@@ -14,11 +19,12 @@
  * @date       2022-09-07 11:23:51
  */
 @Data
-@TableName("event")
+@TableName("com_sanshuo_event_info")
 public class ComEvent implements Serializable {
 	private static final long serialVersionUID = 1L;
 	/**主键*/
 	@ApiModelProperty(name = "id", value = "主键")
+	@TableId(type = IdType.INPUT)
 	private Long id;
 	/**服务单号(流水号)按照日期时间+数字*/
 	@ApiModelProperty(name = "orderSn", value = "服务单号(流水号)按照日期时间+数字")
@@ -81,7 +87,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、区)")
@@ -89,6 +95,9 @@
 	/**当前处理机构ID*/
 	@ApiModelProperty(name = "currentOrgId", value = "当前处理机构ID")
 	private String currentOrgId;
+	/**当前处理机构ID*/
+	@ApiModelProperty(name = "currentOrgName", value = "当前处理机构名称")
+	private String currentOrgName;
 	/**当前机构下处理人ID*/
 	@ApiModelProperty(name = "currentProcessUserId", value = "当前机构下处理人ID")
 	private Long currentProcessUserId;
@@ -98,6 +107,12 @@
 	/**撤销描述*/
 	@ApiModelProperty(name = "revokeDes", value = "撤销描述")
 	private String revokeDes;
+	/**当前调解处理结果*/
+	@ApiModelProperty(name = "currentEventProcessResult", value = "当前调解处理结果")
+	private String currentEventProcessResult;
+	/**调解是否成果1未成果2已成果*/
+	@ApiModelProperty(name = "eventSucceed", value = "调解是否成果1未成功2已成功")
+	private Integer eventSucceed;
 	/**事件结果(1、调解失败2、调解成功)*/
 	@ApiModelProperty(name = "eventResult", value = "事件结果(1、调解失败2、调解成功)")
 	private Integer eventResult;
@@ -140,5 +155,15 @@
 	/**修改时间*/
 	@ApiModelProperty(name = "updateAt", value = "修改时间")
 	private Date updateAt;
-   
+	/**调解上传图片地址列表,逗号进行分割*/
+	@TableField(exist = false)
+	@ApiModelProperty(name = "images", value = "调解上传图片地址列表,逗号进行分割")
+	private List<ComEventRequestImageVO> images;
+	@TableField(exist = false)
+	private String icon;
+	/**调解事件类型*/
+	@TableField(exist = false)
+	private String eventCategoryName;
+	@TableField(exist = false)
+	private String keyword;
 }

--
Gitblit v1.7.1