From 452dc02598112b3ed577d06d38ba017e50d38e9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Fri, 20 Dec 2019 19:31:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../item/service/impl/ItemServiceImpl.java    |  2 +-
 .../main/resources/mapper/item/ItemDao.xml    | 24 ++++++++++---------
 .../controller/KpiMetaDataController.java     |  2 +-
 .../service/impl/KpiMetaDataServiceImpl.java  |  4 ++--
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
index a78bcbab0..c99d06611 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
@@ -870,6 +870,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         kpiEventJobEvaluationFromDTO.setEvaluationLevel(ItemEvaluationLevel.LevaluationLevelBest);
         kpiMetaDataDTOList = baseDao.selectListJobEvaluation(kpiEventJobEvaluationFromDTO);
         allMetaDataList.addAll(kpiMetaDataDTOList);
-        return null;
+        return new Result<List<KpiMetaDataDTO>>().ok(allMetaDataList);
     }
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
index 002f04b58..fa0acf159 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
@@ -918,21 +918,21 @@
 
     <select id="selectListJobEvaluation" resultType="com.elink.esua.epdc.dto.KpiMetaDataDTO">
         SELECT
-            <if test="evaluationLevel=='0">
-                '网格评议不满意数' as data_name,
-                'grid_low_evaluation_amount' as data_code,
+            <if test="evaluationLevel=='0'">
+                '网格评议不满意数' as dataName,
+                'grid_low_evaluation_amount' as dataCode,
             </if>
-            <if test="evaluationLevel=='1">
-                '网格评议基本满意数' as data_name,
-                'grid_medium_evaluation_amount' as data_code,
+            <if test="evaluationLevel=='1'">
+                '网格评议基本满意数' as dataName,
+                'grid_medium_evaluation_amount' as dataCode,
             </if>
-            <if test="evaluationLevel=='2">
+            <if test="evaluationLevel=='2'">
                 '网格评议满意数' as data_name,
-                'grid_high_evaluation_amount' as data_code,
+                'grid_high_evaluation_amount' as dataCode,
             </if>
-            COUNT(ed.ID),
-            #{startTime} as startDate,
-            DATE(DATE_SUB(#{endTime}, INTERVAL 1 DAY)) as endDate,
+            COUNT(ed.ID) as dataValue,
+            #{startDate} as startDate,
+            #{endDate} as endDate
         FROM
         <foreach item="deptId" collection="deptIdList" open="(  " separator="UNION ALL" close=") dept">
             SELECT #{deptId} AS deptId
@@ -942,5 +942,7 @@
         AND
         #{evaluationLevel} = ed.EVALUATION_LEVEL
         AND  ed.DEL_FLAG = '0' AND ed.CREATED_TIME BETWEEN #{startDate} AND #{endDate}
+        GROUP BY
+        dept.deptId
     </select>
 </mapper>
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiMetaDataController.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiMetaDataController.java
index e0af5b4a0..c06973750 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiMetaDataController.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiMetaDataController.java
@@ -105,7 +105,7 @@ public class KpiMetaDataController {
         // 统计网格内 群众对网格问题办理 满意度评价
 //        kpiMetaDataService.statPeopleEvaluation();
         //网格呼叫事项总数 与响应呼叫数（议题流转项目）
-        kpiMetaDataService.createItemMataData();
+//        kpiMetaDataService.createItemMataData();
         //网格工作评议
         kpiMetaDataService.createJobEvaluation();
         return new Result();
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java
index 59c966417..4674953b7 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java
@@ -523,8 +523,8 @@ public class KpiMetaDataServiceImpl extends BaseServiceImpl<KpiMetaDataDao, KpiM
     private List<KpiMetaDataDTO> getjobEvaluationDataModule(KpiEventJobEvaluationFromDTO kpiEventJobEvaluationFromDTO) {
         Result<List<KpiMetaDataDTO>> listResult = eventFeignClient.queryListJobEvaluation(kpiEventJobEvaluationFromDTO);
         if (!listResult.success() || null == listResult.getData()) {
-            log.error("统计事件上报数异常");
-            throw new RenException("统计事件上报数异常");
+            log.error("统计网格工作评议数异常");
+            throw new RenException("统计网格工作评议数异常");
         }
         return listResult.getData();
     }