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