From 7d0310cafba32916c055ac0d04fef6b6c02c6eb7 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 11 十月 2022 11:27:33 +0800
Subject: [PATCH] update
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEvent.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 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..7c9756f 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、行业分中心")
@@ -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")
private Date createAt;
/**修改人*/
@ApiModelProperty(name = "updateBy", value = "修改人")
@@ -161,4 +167,16 @@
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;
}
--
Gitblit v1.7.1