From a7e51f7d5d77a0019723c5dcf1a65599a4bf2b7b Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 17 十一月 2022 11:23:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java | 51 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 11 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 d6b9b4d..9cf8a12 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
@@ -97,7 +97,7 @@
Boolean isExpertCheck=false;
Long expertId=null;
Boolean isStretAccount = isStreetAccount(loginUserInfoVO);
- comEvent.setAppId(loginUserInfoVO.getAppId());
+// comEvent.setAppId(loginUserInfoVO.getAppId());
if (nonNull(comEvent.getUserType())){
if (comEvent.getUserType().equals(1)){
//个人账号权限
@@ -258,6 +258,7 @@
comEvent.setArchive(0);
comEvent.setConciliation(0);
comEvent.setChangeExpert(0);
+ comEvent.setDistribution(0);
} else if(comEvent.getEventProcessStatus().equals(2)){
//待分配和待验证状态，可以受理，分配专家
//关闭调解和归档
@@ -302,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);
@@ -325,8 +326,11 @@
//关闭所有权限
comEvent.setDistribution(0);
comEvent.setSolve(0);
- comEvent.setArchive(0);
+ //comEvent.setArchive(0);
+ comEvent.setChangeExpert(0);
+ comEvent.setConciliation(0);
}
+
}
else{
//已上报到街道或三说会堂，社区没有分配和受理权限权限
@@ -368,7 +372,8 @@
//调解中，可以查看，调解，更换专家,删除
comEvent.setDistribution(0);
comEvent.setArchive(0);
- } else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventResult().equals(1)){
+ comEvent.setSolve(0);
+ }else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventResult().equals(1) && !comEvent.getIsEnd().equals(1)){
//调解完成，可以归档,查看
comEvent.setEventResult(null);
comEvent.setEventProcessStatus(2);
@@ -377,12 +382,12 @@
//comEvent.setChangeExpert(0);
//comEvent.setArchive(0);
comEvent.setConciliation(0);
- }
- else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventSucceed().equals(2)){
+ }else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventSucceed().equals(2)){
//调解完成，可以归档,查看
comEvent.setSolve(0);
comEvent.setDistribution(0);
comEvent.setChangeExpert(0);
+ comEvent.setConciliation(0);
}
}else if (comEvent.getCurrentProcessType().equals(5)){
//根据事件状态决定权限
@@ -424,11 +429,12 @@
}
else{
//未上上报到行业分中心，或者已上报到区三说会堂，仅查看
- comEvent.setArchive(0);
+ //comEvent.setArchive(0);
comEvent.setSolve(0);
comEvent.setDistribution(0);
comEvent.setChangeExpert(0);
- //comEvent.setConciliation(0);
+ comEvent.setConciliation(0);
+
}
}else if (userType.equals(5) || isStreet){
//街道权限，操作街道下属社区的所有事件
@@ -466,7 +472,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);
@@ -534,7 +540,7 @@
comEvent.setDistribution(0);
comEvent.setSolve(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.setSolve(0);
comEvent.setDistribution(0);
@@ -657,6 +663,9 @@
}
public void sendMessage(Long expertId,ComEvent comEvent){
+ if (nonNull(comEvent.getRequestUserCommunity()) && comEvent.getRequestUserCommunity().equals(10172)){
+ return;
+ }
//获取专家的openId
ComSanshuoExpert expert = comSanShuoExpertService.getById(expertId);
SysUser sysUser = sysUserDao.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getPhone, expert.getPhone()).eq(SysUser::getType, 1).eq(SysUser::getAppId,"wx0cef797390444b75" ));
@@ -814,6 +823,11 @@
}else {
//已是最高上报级别，无法上报
}
+ }
+
+ //是否为已完成并且不上报
+ if (!comEventConciliationVO.getReportSuperior() && comEventConciliationVO.getEventSucceed().equals(2)){
+ comEvent.setIsEnd(1);
}
int flag = baseMapper.updateById(comEvent);
comEventTransferRecord.setEventId(comEvent.getId());
@@ -1005,7 +1019,12 @@
}
}
log.info("当前userType===="+comEvent.getUserType());
- comEvent.setAppId(loginUserInfoVO.getAppId());
+ //comEvent.setAppId(loginUserInfoVO.getAppId());
+ R<LoginUserInfoVO> r = userService.detailUser(loginUserInfoVO.getUserId());
+ LoginUserInfoVO user = r.getData();
+ if (nonNull(user.getAppId())){
+ comEvent.setAppId(user.getAppId());
+ }
List<ComEventCalculateVO> calculateList = baseMapper.calculate(comEvent);
ComEventCalculateVO comEventCalculateVO =new ComEventCalculateVO();
comEventCalculateVO.setStatus("0");
@@ -1094,9 +1113,19 @@
if (type.equals(1)){
//受理级别占比
List<EventRateVO> eventRateVOS = comEventMapper.eventRate();
+ //获取专家受理的数量
+ Integer expertCount=comEventMapper.expertSolveCountCommunity();
+ //获取行业分中心受理数量
+ Integer centerCount=comEventMapper.expertSolveCountCenter();
for (EventRateVO eventRateVO : eventRateVOS) {
if (nonNull(eventRateVO)){
eventRateVO.setName(typeToName(eventRateVO.getCurrentProcessType()));
+ if (eventRateVO.getCurrentProcessType().equals(2)){
+ eventRateVO.setCount(eventRateVO.getCount()+expertCount);
+ }
+ if (eventRateVO.getCurrentProcessType().equals(1)){
+ eventRateVO.setCount(eventRateVO.getCount()+centerCount);
+ }
if (nonNull(eventCount) && !eventCount.equals(0)){
//计算占比
eventRateVO.setRate(NumberUtil.div(eventRateVO.getCount(),eventCount,2));
--
Gitblit v1.7.1