From 2dab3f149c6245e80f0c0991264d01cbcd2f91e5 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 01 八月 2023 14:13:36 +0800
Subject: [PATCH] 修改三说专家级别与单位范围报错
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEvent.java | 98 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 92 insertions(+), 6 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..5e40007 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,17 @@
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.fasterxml.jackson.annotation.JsonFormat;
+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 +20,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 = "服务单号（流水号）按照日期时间+数字")
@@ -46,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")
@@ -76,19 +85,23 @@
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、行业分中心")
private Integer revokeType;
- /**工作人员的事件处理状态1待处理2待验证3专家已受理4专家未受理，拒绝5调解中6已结案归档7调解取消*/
- @ApiModelProperty(name = "eventProcessStatus", value = "工作人员的事件处理状态1待处理2待验证3专家已受理4专家未受理，拒绝5调解中6已结案归档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、区）*/
- @ApiModelProperty(name = "currentProcessType", value = "当前处理对象类型（1、行业分中心2、社区3、是街道4、区）")
+ /**当前处理对象类型（1、行业分中心2、社区3、是街道4、区三说会堂,5专家）*/
+ @ApiModelProperty(name = "currentProcessType", value = "当前处理对象类型（1、行业分中心2、社区3、是街道4、区5专家）")
private Integer currentProcessType;
/**当前处理机构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 +111,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;
@@ -109,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 = "是否紧急")
@@ -133,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 = "修改人")
@@ -140,5 +161,70 @@
/**修改时间*/
@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;
+ @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;
+ @TableField(exist = false)
+ private Integer hasPerm;
+ @TableField(exist = false)
+ private List<Long> communityIds;
+ @TableField(exist = false)
+ private List<Long> eventIds;
+ private Integer reportCommunity;
+ private Integer reportCenter;
+ private Integer reportStreet;
+ private Integer reportHall;
+ //受理
+ @TableField(exist = false)
+ private Integer solve;
+ //调解
+ @TableField(exist = false)
+ private Integer conciliation;
+ //分配
+ @TableField(exist = false)
+ private Integer distribution;
+ //删除
+ @TableField(exist = false)
+ private Integer delete;
+ //归档
+ @TableField(exist = false)
+ private Integer archive;
+ //更换专家
+ @TableField(exist = false)
+ private Integer changeExpert;
+ private String appId;
+ @TableField(exist = false)
+ @ApiModelProperty("开始时间")
+ private String startTime;
+ @TableField(exist = false)
+ @ApiModelProperty("结束时间")
+ private String endTime;
+ @TableField(exist = false)
+ private Integer level;
+ @TableField(exist = false)
+ private Long searchId;
+ private Integer isEnd;
+
}
--
Gitblit v1.7.1