From 0430cf26ba8646c65ffb1d1a0fbdb191a8c29d74 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期四, 17 十一月 2022 16:30:02 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 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 79811b5..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
@@ -1113,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