From 5b637ec522212f90b9355fe4c513ebd1518c7c28 Mon Sep 17 00:00:00 2001
From: zxc <954985706@qq.com>
Date: Wed, 24 Jun 2020 14:18:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/group/constant/GroupConstant.java   |  2 +-
 .../epmet/topic/constant/TopicConstant.java   |  2 +-
 .../main/resources/mapper/topic/TopicDao.xml  | 24 ++++++-------------
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/constant/GroupConstant.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/constant/GroupConstant.java
index 699090f931..cfc64da174 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/constant/GroupConstant.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/constant/GroupConstant.java
@@ -7,6 +7,6 @@ package com.epmet.group.constant;
 public interface GroupConstant {
 
     String MONTH = "month";
-    String DATE = "date";
+    String DATE = "day";
 
 }
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/topic/constant/TopicConstant.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/topic/constant/TopicConstant.java
index 62c27f4b55..46259526ce 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/topic/constant/TopicConstant.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/topic/constant/TopicConstant.java
@@ -26,5 +26,5 @@ public interface TopicConstant {
     String SHIFTED = "已转议题";
 
     String MONTH = "month";
-    String DATE = "date";
+    String DATE = "day";
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/topic/TopicDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/topic/TopicDao.xml
index 06e60565b6..6945fb4baa 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/topic/TopicDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/topic/TopicDao.xml
@@ -13,10 +13,9 @@
         WHERE
             del_flag = '0'
             AND agency_id = #{agencyId}
-        GROUP BY
-            topic_status_id
         ORDER BY
             date_id DESC
+        LIMIT 3
     </select>
 
     <!--获取机关下已转议题数量-->
@@ -42,16 +41,15 @@
             WHEN topic_status_id = 'hidden' THEN '已屏蔽'
             WHEN topic_status_id = 'closed' THEN '已关闭'
             ELSE '无' END) AS name,
-            CONCAT(topic_proportion,'%') AS ratio
+            CONCAT(topic_proportion * 100,'%') AS ratio
         FROM
             fact_topic_status_agency_daily
         WHERE
             del_flag = '0'
             AND agency_id = #{agencyId}
-        GROUP BY
-            topic_status_id
         ORDER BY
             date_id DESC
+        LIMIT 3
     </select>
 
     <!--根据当前机关判断是否有下级机关-->
@@ -80,10 +78,7 @@
 			LEFT JOIN dim_agency da ON da.id = ftsad.agency_id AND da.del_flag = '0'
         WHERE
             ftsad.del_flag = '0'
-        GROUP BY
-            ftsad.topic_status_id
-        ORDER BY
-            ftsad.date_id DESC
+            AND ftsad.date_id = (SELECT MAX(date_id) AS dateId FROM fact_topic_status_agency_daily WHERE del_flag = '0')
     </select>
 
     <!--获取最后一天的所有话题已转议题数据-->
@@ -98,8 +93,7 @@
 			LEFT JOIN dim_agency da ON da.id = ftiad.agency_id AND da.del_flag = '0'
         WHERE
             ftiad.del_flag = '0'
-		GROUP BY ftiad.agency_id
-        ORDER BY ftiad.date_id DESC
+		    AND ftiad.date_id = (SELECT MAX(date_id) AS dateId FROM fact_topic_issue_agency_daily WHERE del_flag = '0')
     </select>
 
     <!--校验机关下是否存在直属网格-->
@@ -128,10 +122,7 @@
 			LEFT JOIN dim_grid dg ON dg.id = ftsad.grid_id AND dg.del_flag = '0'
         WHERE
             ftsad.del_flag = '0'
-        GROUP BY
-            ftsad.topic_status_id
-        ORDER BY
-            ftsad.date_id DESC
+            AND ftsad.date_id = (SELECT MAX(date_id) AS dateId FROM fact_topic_status_grid_daily WHERE del_flag = '0')
     </select>
 
     <!--获取最后一天的所有话题已转议题数据-->
@@ -146,8 +137,7 @@
 			LEFT JOIN dim_grid da ON da.id = ftiad.grid_id AND da.del_flag = '0'
         WHERE
             ftiad.del_flag = '0'
-		GROUP BY ftiad.grid_id
-        ORDER BY ftiad.date_id DESC
+		    AND ftiad.date_id = (SELECT MAX(date_id) AS dateId FROM fact_topic_issue_grid_daily WHERE del_flag = '0')
     </select>
 
     <!--话题日增长-->