From 1c895a9712705a4ead0f49013600f2172bad5405 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Sat, 5 Jun 2021 20:02:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E4=B9=9F=E6=98=AF=E6=97=A0=E6=95=8C?=
 =?UTF-8?q?=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/datastats/DatsStatsDao.xml         | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
index d31325b4f4..fb5757da88 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
@@ -360,17 +360,17 @@
         SELECT
             orgId,
             orgName,
-            ifnull(GROUP_COUNT,0), GROUP_COUNT
-            ifnull(GROUP_RATIO,0), GROUP_RATIO
-            ifnull(GROUP_MEMBER_COUNT,0), GROUP_MEMBER_COUNT
-            ifnull(GROUP_MEMBER_RATIO,0), GROUP_MEMBER_RATIO
-            ifnull(TOPIC_COUNT,0), TOPIC_COUNT
-            ifnull(TOPIC_RATIO,0), TOPIC_RATIO
-            ifnull(ISSUE_COUNT,0), ISSUE_COUNT
-            ifnull(ISSUE_RATIO,0), ISSUE_RATIO
-            ifnull(PROJECT_COUNT,0), PROJECT_COUNT
-            ifnull(PROJECT_RATIO,0), PROJECT_RATIO
-            ifnull(PROJECT_CLOSED_COUNT,0), PROJECT_CLOSED_COUNT
+            ifnull(GROUP_COUNT,0) AS GROUP_COUNT,
+            ifnull(GROUP_RATIO,0) AS GROUP_RATIO,
+            ifnull(GROUP_MEMBER_COUNT,0) AS GROUP_MEMBER_COUNT,
+            ifnull(GROUP_MEMBER_RATIO,0) AS GROUP_MEMBER_RATIO,
+            ifnull(TOPIC_COUNT,0) AS TOPIC_COUNT,
+            ifnull(TOPIC_RATIO,0) AS TOPIC_RATIO,
+            ifnull(ISSUE_COUNT,0) AS ISSUE_COUNT,
+            ifnull(ISSUE_RATIO,0) AS ISSUE_RATIO,
+            ifnull(PROJECT_COUNT,0) AS PROJECT_COUNT,
+            ifnull(PROJECT_RATIO,0) AS PROJECT_RATIO,
+            ifnull(PROJECT_CLOSED_COUNT,0) AS PROJECT_CLOSED_COUNT,
             ifnull(PROJECT_CLOSED_RATIO,0) PROJECT_CLOSED_RATIO
         FROM
             (
@@ -403,18 +403,18 @@
         SELECT
             orgId,
             orgName,
-             ifnull(GROUP_COUNT,0), GROUP_COUNT
-             ifnull(GROUP_RATIO,0), GROUP_RATIO
-             ifnull(GROUP_MEMBER_COUNT,0), GROUP_MEMBER_COUNT
-             ifnull(GROUP_MEMBER_RATIO,0), GROUP_MEMBER_RATIO
-             ifnull(TOPIC_COUNT,0), TOPIC_COUNT
-             ifnull(TOPIC_RATIO,0), TOPIC_RATIO
-             ifnull(ISSUE_COUNT,0), ISSUE_COUNT
-             ifnull(ISSUE_RATIO,0), ISSUE_RATIO
-             ifnull(PROJECT_COUNT,0), PROJECT_COUNT
-             ifnull(PROJECT_RATIO,0), PROJECT_RATIO
-             ifnull(PROJECT_CLOSED_COUNT,0), PROJECT_CLOSED_COUNT
-             ifnull(PROJECT_CLOSED_RATIO,0) PROJECT_CLOSED_RATIO
+             ifnull(GROUP_COUNT,0) AS GROUP_COUNT,
+             ifnull(GROUP_RATIO,0) AS GROUP_RATIO,
+             ifnull(GROUP_MEMBER_COUNT,0) AS GROUP_MEMBER_COUNT,
+             ifnull(GROUP_MEMBER_RATIO,0) AS GROUP_MEMBER_RATIO,
+             ifnull(TOPIC_COUNT,0) AS TOPIC_COUNT,
+             ifnull(TOPIC_RATIO,0) AS TOPIC_RATIO,
+             ifnull(ISSUE_COUNT,0) AS ISSUE_COUNT,
+             ifnull(ISSUE_RATIO,0) AS ISSUE_RATIO,
+             ifnull(PROJECT_COUNT,0) AS PROJECT_COUNT,
+             ifnull(PROJECT_RATIO,0) AS PROJECT_RATIO,
+             ifnull(PROJECT_CLOSED_COUNT,0) AS PROJECT_CLOSED_COUNT,
+             ifnull(PROJECT_CLOSED_RATIO,0)  AS PROJECT_CLOSED_RATIO
         FROM
             (
                 SELECT