From 3cb4d7e6e065b8c66f25475b3d4abe38c1cd6d08 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 16 Sep 2020 09:21:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=94=E6=9D=91=E5=A4=A7=E5=B1=8F=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=87=AA=E6=B5=8B=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/bootstrap.yml          |  1 +
 .../ScreenKcTopicTrendGridMonthlyDao.xml      |  2 +-
 .../ScreenKcVolunteerSummaryDailyDao.xml      | 32 ++++++++++++-------
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml
index de94f499a2..323b2a7fca 100644
--- a/epmet-gateway/src/main/resources/bootstrap.yml
+++ b/epmet-gateway/src/main/resources/bootstrap.yml
@@ -442,6 +442,7 @@ epmet:
   urlWhiteList:
     - /data/report/test/test
     - /data/report/screen/**
+    - /data/report/screenkc/**
     - /epmetuser/customerstaff/customerlist
 
   swaggerUrls:
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcTopicTrendGridMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcTopicTrendGridMonthlyDao.xml
index 5fed5bda9c..60f288f628 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcTopicTrendGridMonthlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcTopicTrendGridMonthlyDao.xml
@@ -16,7 +16,7 @@
                     del_flag = '0'
                 and customer_id = #{customerId}
                 and month_id = monthId
-            )
+            ) "topicCount"
         FROM
             screen_kc_topic_trend_grid_monthly
         WHERE
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcVolunteerSummaryDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcVolunteerSummaryDailyDao.xml
index 62f94e5d1f..d6a88821a2 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcVolunteerSummaryDailyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcVolunteerSummaryDailyDao.xml
@@ -5,21 +5,31 @@
 
     <select id="selectVolunteerSummaryDaily" resultType="com.epmet.evaluationindex.screen.dto.result.AgeDistributionResultDTO">
         SELECT
-            age_level_1 AS "ageLevel1",
-            age_level_2 AS "ageLevel2",
-            age_level_3 AS "ageLevel3",
-            age_level_4 AS "ageLevel4",
-            age_level_5 AS "ageLevel5",
-            age_level_6 AS "ageLevel6",
-            male_count AS "maleCount",
-            female_count AS "femaleCount"
+            SUM(age_level_1) AS "ageLevel1",
+            SUM(age_level_2) AS "ageLevel2",
+            SUM(age_level_3) AS "ageLevel3",
+            SUM(age_level_4) AS "ageLevel4",
+            SUM(age_level_5) AS "ageLevel5",
+            SUM(age_level_6) AS "ageLevel6",
+            SUM(male_count) AS "maleCount",
+            SUM(female_count) AS "femaleCount"
         FROM
             screen_kc_volunteer_summary_daily
         WHERE
             del_flag = '0'
         AND customer_id = #{customerId}
-        ORDER BY
-            date_id DESC, created_time DESC
-        LIMIT 1
+        AND date_id = (
+            select
+                date_id
+            from
+                screen_kc_volunteer_summary_daily
+            where
+                del_flag = '0'
+            and customer_id = #{customerId}
+            order by
+                date_id desc,
+                created_time desc
+            limit 1
+        )
     </select>
 </mapper>