From dfc742da02a7e764d49a750f37b469deecbd80ef Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 16 十一月 2022 11:18:08 +0800
Subject: [PATCH] update

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
index d74b9fc..ea5582f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
@@ -303,7 +303,7 @@
                     comEvent.setSolve(0);
                     comEvent.setArchive(0);
                     comEvent.setDistribution(0);
-                } else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventResult().equals(1)){
+                } else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventResult().equals(1) && !comEvent.getIsEnd().equals(1)){
                     //上报并且调解失败,此时事件的状态为6,事件结果为调解失败
                     //comEvent.setDistribution(0);
                     comEvent.setEventResult(null);
@@ -370,7 +370,7 @@
                     //调解中,可以查看,调解,更换专家,删除
                     comEvent.setDistribution(0);
                     comEvent.setArchive(0);
-                }  else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventResult().equals(1)){
+                }  else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventResult().equals(1) && !comEvent.getIsEnd().equals(1)){
                     //调解完成,可以归档,查看
                     comEvent.setEventResult(null);
                     comEvent.setEventProcessStatus(2);
@@ -468,7 +468,7 @@
                     comEvent.setEventResult(null);
                     comEvent.setEventProcessStatus(1);
                 }
-                else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventResult().equals(1)){
+                else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventResult().equals(1) && !comEvent.getIsEnd().equals(1)){
                     //设置为待受理
                     comEvent.setEventResult(null);
                     comEvent.setEventProcessStatus(2);

--
Gitblit v1.7.1