From 74a3dcc6e40e46b598ed398227e78cf2af6227c0 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 18 十月 2022 11:20:07 +0800
Subject: [PATCH] 三说会堂事件操作权限处理

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java |   61 +++++++++++++++++++++++++-----
 1 files changed, 51 insertions(+), 10 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 11ccfd9..e92bb30 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
@@ -222,12 +222,13 @@
                 comEvent.setSolve(0);
                 return;
             }//未上报,根据状态决定权限
-            if (comEvent.getEventProcessStatus().equals(1) || comEvent.getEventProcessStatus().equals(2)){
+            if (comEvent.getEventProcessStatus().equals(1)){
                 //待受理和待验证状态,仅有查看和受理权限,可能为用户选择该专家或上级单位分配给该专家
                 //关闭调解和归档
                 comEvent.setArchive(0);
                 comEvent.setConciliation(0);
-            } else if (comEvent.getEventProcessStatus().equals(5)){
+            }
+            else if (comEvent.getEventProcessStatus().equals(5)){
                 //调解中,可以查看,调解
                 comEvent.setArchive(0);
                 comEvent.setSolve(0);
@@ -246,13 +247,23 @@
             //如果未上报到街道,当前事件权限和专家一样
             if (comEvent.getCurrentProcessType().equals(5)){
                 //根据事件状态决定权限
-                if (comEvent.getEventProcessStatus().equals(1) || comEvent.getEventProcessStatus().equals(2)){
+                if (comEvent.getEventProcessStatus().equals(1) ){
                     //待受理和待验证状态,可以受理,分配专家
                     //关闭调解和归档
                     comEvent.setArchive(0);
                     comEvent.setConciliation(0);
                     comEvent.setChangeExpert(0);
-                } else if (comEvent.getEventProcessStatus().equals(5)){
+                } else if(comEvent.getEventProcessStatus().equals(2)){
+                    //待分配和待验证状态,可以受理,分配专家
+                    //关闭调解和归档
+                    comEvent.setArchive(0);
+                    comEvent.setConciliation(0);
+                    comEvent.setChangeExpert(0);
+                    if (comEvent.getSpecialistName().equals("待分配")){
+                        comEvent.setSolve(0);
+                    }
+                }
+                else if (comEvent.getEventProcessStatus().equals(5)){
                     //调解中,可以查看,调解,更换专家,删除
                     comEvent.setDistribution(0);
                     comEvent.setSolve(0);
@@ -325,11 +336,20 @@
             //是否上报到行业分中心
             if (comEvent.getReportCenter().equals(1) || comEvent.getCurrentProcessType().equals(1)){
                 //已经报到行业分中心
-                if (comEvent.getEventProcessStatus().equals(1) || comEvent.getEventProcessStatus().equals(2)){
+                if (comEvent.getEventProcessStatus().equals(1) ){
                     //待受理和待验证状态,可以受理,分配专家
                     //关闭调解和归档
                     comEvent.setArchive(0);
                     comEvent.setConciliation(0);
+                }else if(comEvent.getEventProcessStatus().equals(2)){
+                    //待分配和待验证状态,可以受理,分配专家
+                    //关闭调解和归档
+                    comEvent.setArchive(0);
+                    comEvent.setConciliation(0);
+                    comEvent.setChangeExpert(0);
+                    if (comEvent.getSpecialistName().equals("待分配")){
+                        comEvent.setSolve(0);
+                    }
                 }
                 else if (comEvent.getEventProcessStatus().equals(3)){
                     //分配新专家后
@@ -369,7 +389,7 @@
             //是否上报到街道
             if (comEvent.getReportStreet().equals(1) || comEvent.getCurrentProcessType().equals(3)){
                 //已上报到街道
-                if (comEvent.getEventProcessStatus().equals(1) || comEvent.getEventProcessStatus().equals(2)){
+                if (comEvent.getEventProcessStatus().equals(1) ){
                     //待受理和待验证状态,可以受理,分配专家
                     //关闭调解和归档
                     comEvent.setArchive(0);
@@ -377,7 +397,16 @@
                     comEvent.setChangeExpert(0);
                     //comEvent.setDistribution(0);
                     comEvent.setSolve(0);
-                } else if (comEvent.getEventProcessStatus().equals(5)){
+                } else if(comEvent.getEventProcessStatus().equals(2)){
+                    //待分配和待验证状态,可以受理,分配专家
+                    //关闭调解和归档
+                    comEvent.setArchive(0);
+                    comEvent.setConciliation(0);
+                    comEvent.setChangeExpert(0);
+                    if (comEvent.getSpecialistName().equals("待分配")){
+                        comEvent.setSolve(0);
+                    }
+                }else if (comEvent.getEventProcessStatus().equals(5)){
                     //调解中,可以查看,调解,更换专家,删除
                     comEvent.setDistribution(0);
                     comEvent.setArchive(0);
@@ -423,14 +452,24 @@
             // 是否上报到三说会堂
             if (comEvent.getCurrentProcessType().equals(4) || comEvent.getReportHall().equals(1)){
                 //已上报到三说会堂,可以操作
-                if (comEvent.getEventProcessStatus().equals(1) || comEvent.getEventProcessStatus().equals(2)){
+                if (comEvent.getEventProcessStatus().equals(1)){
                     //待受理和待验证状态,可以受理,分配专家
                     //关闭调解和归档
                     comEvent.setArchive(0);
                     comEvent.setSolve(0);
                     comEvent.setConciliation(0);
                     comEvent.setChangeExpert(0);
-                } else if (comEvent.getEventProcessStatus().equals(3)){
+                }
+                else if(comEvent.getEventProcessStatus().equals(2)){
+                    //待分配和待验证状态,可以受理,分配专家
+                    //关闭调解和归档
+                    comEvent.setArchive(0);
+                    comEvent.setConciliation(0);
+                    comEvent.setChangeExpert(0);
+                    if (comEvent.getSpecialistName().equals("待分配")){
+                        comEvent.setSolve(0);
+                    }
+                }else if (comEvent.getEventProcessStatus().equals(3)){
                     //新分配给专家并且专家还未受理
                     comEvent.setDistribution(0);
                     comEvent.setArchive(0);
@@ -801,7 +840,9 @@
         ComSanshuoExpert specter = comSanShuoExpertService.getById(specialistId);
         comEvent.setSpecialistAcceptTime(new Date());
         comEvent.setSpecialistName(specter.getName());
-        comEvent.setEventProcessStatus(SanShuoEventStatusEnum.VALID.getCode());
+        if (comEvent.getEventProcessStatus()<SanShuoEventStatusEnum.conciliation.getCode()){
+            comEvent.setEventProcessStatus(SanShuoEventStatusEnum.VALID.getCode());
+        }
         int flag = baseMapper.updateById(comEvent);
         //添加一条对应记录
         comEventMapper.insertEventAndExpertRecord(id, specialistId,1);

--
Gitblit v1.7.1