From 06180fa3c8ee17d731561b88897fa18b9f8cf228 Mon Sep 17 00:00:00 2001 From: yanghui <2536613402@qq.com> Date: 星期五, 04 十一月 2022 17:53:50 +0800 Subject: [PATCH] Merge branch 'huacheng_test' into local_20221104 --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEvent.java | 33 +++++++++++++++++++++++++++++++-- 1 files changed, 31 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 e35bd9e..d4fa18d 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 @@ -90,11 +90,11 @@ /**撤销类型 1 用户 2 社区3、街道4、行业分中心*/ @ApiModelProperty(name = "revokeType", value = "撤销类型 1 用户 2 社区3、街道4、行业分中心") private Integer revokeType; - /**工作人员的事件处理状态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、区三说会堂,5专家）*/ - @ApiModelProperty(name = "currentProcessType", value = "当前处理对象类型（1、行业分中心2、社区3、是街道4、区）") + @ApiModelProperty(name = "currentProcessType", value = "当前处理对象类型（1、行业分中心2、社区3、是街道4、区5专家）") private Integer currentProcessType; /**当前处理机构ID*/ @ApiModelProperty(name = "currentOrgId", value = "当前处理机构ID") @@ -186,4 +186,33 @@ 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; + } -- Gitblit v1.7.1