From 3ee62e76c51a78e0cd1854c8b35c6b02e6f7369a Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 12 十一月 2024 11:50:46 +0800
Subject: [PATCH] 花城 修改志愿者返回参数内容
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java | 117 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 65 insertions(+), 52 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 03499e5..3d6ee67 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
@@ -514,55 +514,8 @@
}else if (isAdmin){
//区三说会堂账号，最高权限全部开放
// 是否上报到三说会堂
- if (comEvent.getCurrentProcessType().equals(4) || comEvent.getReportHall().equals(1)){
- //已上报到三说会堂,可以操作
- if (comEvent.getEventProcessStatus().equals(1)){
- //待受理和待验证状态，可以受理，分配专家
- //关闭调解和归档
- comEvent.setArchive(0);
- comEvent.setSolve(0);
- comEvent.setConciliation(0);
- comEvent.setChangeExpert(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)){
- //新分配给专家并且专家还未受理
- comEvent.setDistribution(0);
- comEvent.setArchive(0);
- //comEvent.setConciliation(0);
- comEvent.setChangeExpert(0);
- comEvent.setSolve(0);
- }
- else if (comEvent.getEventProcessStatus().equals(5)){
- //调解中，可以查看，调解，更换专家,删除
- comEvent.setDistribution(0);
- comEvent.setSolve(0);
- comEvent.setArchive(0);
- } else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventResult().equals(1) && !comEvent.getIsEnd().equals(1)){
- //失败后转交三说会堂
- comEvent.setSolve(0);
- comEvent.setDistribution(0);
- //comEvent.setConciliation(0);
- comEvent.setEventProcessStatus(2);
- comEvent.setArchive(0);
- //comEvent.setChangeExpert(0);
- }
- else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventSucceed().equals(2)){
- //调解完成，可以归档,查看
- comEvent.setConciliation(0);
- comEvent.setSolve(0);
- comEvent.setDistribution(0);
- comEvent.setChangeExpert(0);
- }
- }else{
+ if(comEvent.getCurrentProcessType()==null)
+ {
//未上报到三说会堂,仅查看
comEvent.setArchive(0);
comEvent.setSolve(0);
@@ -570,6 +523,66 @@
comEvent.setChangeExpert(0);
comEvent.setConciliation(0);
}
+ else
+ {
+ if (comEvent.getCurrentProcessType().equals(4) || comEvent.getReportHall().equals(1)){
+ //已上报到三说会堂,可以操作
+ if (comEvent.getEventProcessStatus().equals(1)){
+ //待受理和待验证状态，可以受理，分配专家
+ //关闭调解和归档
+ comEvent.setArchive(0);
+ comEvent.setSolve(0);
+ comEvent.setConciliation(0);
+ comEvent.setChangeExpert(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)){
+ //新分配给专家并且专家还未受理
+ comEvent.setDistribution(0);
+ comEvent.setArchive(0);
+ //comEvent.setConciliation(0);
+ comEvent.setChangeExpert(0);
+ comEvent.setSolve(0);
+ }
+ else if (comEvent.getEventProcessStatus().equals(5)){
+ //调解中，可以查看，调解，更换专家,删除
+ comEvent.setDistribution(0);
+ comEvent.setSolve(0);
+ comEvent.setArchive(0);
+ } else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventResult().equals(1) && !comEvent.getIsEnd().equals(1)){
+ //失败后转交三说会堂
+ comEvent.setSolve(0);
+ comEvent.setDistribution(0);
+ //comEvent.setConciliation(0);
+ comEvent.setEventProcessStatus(2);
+ comEvent.setArchive(0);
+ //comEvent.setChangeExpert(0);
+ }
+ else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventSucceed().equals(2)){
+ //调解完成，可以归档,查看
+ comEvent.setConciliation(0);
+ comEvent.setSolve(0);
+ comEvent.setDistribution(0);
+ comEvent.setChangeExpert(0);
+ }
+ }else{
+ //未上报到三说会堂,仅查看
+ comEvent.setArchive(0);
+ comEvent.setSolve(0);
+ comEvent.setDistribution(0);
+ comEvent.setChangeExpert(0);
+ comEvent.setConciliation(0);
+ }
+ }
+
}
}
@@ -590,15 +603,15 @@
}
//上报级别是否匹配当前账号级别
if (sysUser.getType().equals(12) ){
- if (!comEvent.getCurrentProcessType().equals(1)){
+ if (comEvent.getCurrentProcessType()!=null && !comEvent.getCurrentProcessType().equals(1)){
perm=0;
}
}else if (StringUtils.equals("admin",account)){
- if (comEvent.getCurrentProcessType()!=4){
+ if ( comEvent.getCurrentProcessType()!=null && comEvent.getCurrentProcessType()!=4){
perm=0;
}
}else if (isStreetAccount(sysUser)){
- if (comEvent.getCurrentProcessType()!=3){
+ if (comEvent.getCurrentProcessType()!=null && comEvent.getCurrentProcessType()!=3){
perm=0;
}
}
--
Gitblit v1.7.1