From 22e03030c865a15349031ff850e364c41088e7e5 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 20 十月 2022 19:08:19 +0800
Subject: [PATCH] update

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 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 0508a2e..af0a4ef 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
@@ -393,7 +393,7 @@
                     //待分配和待验证状态,可以受理,分配专家
                     //关闭调解和归档
                     comEvent.setArchive(0);
-                    comEvent.setConciliation(0);
+                    //comEvent.setConciliation(0);
                     comEvent.setChangeExpert(0);
                     if (comEvent.getSpecialistName().equals("待分配")){
                         comEvent.setSolve(0);
@@ -404,7 +404,14 @@
                     comEvent.setDistribution(0);
                     comEvent.setSolve(0);
                     comEvent.setArchive(0);
-                } else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventSucceed().equals(2)){
+                }else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventResult().equals(2) && comEvent.getEventSucceed().equals(2)){
+                    //调解完成并且成功,可以归档,查看
+                    comEvent.setSolve(0);
+                    comEvent.setDistribution(0);
+                    comEvent.setChangeExpert(0);
+                    comEvent.setConciliation(0);
+                }
+                else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventSucceed().equals(2)){
                     //调解完成,可以归档,查看
                     comEvent.setSolve(0);
                     comEvent.setDistribution(0);
@@ -418,6 +425,7 @@
                 comEvent.setSolve(0);
                 comEvent.setDistribution(0);
                 comEvent.setChangeExpert(0);
+                //comEvent.setConciliation(0);
             }
         }else if (userType.equals(5)  || isStreet){
             //街道权限,操作街道下属社区的所有事件

--
Gitblit v1.7.1