From 3d7acb2ac7a8675515c044c55fb7f100c1095c98 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Fri, 4 Jun 2021 14:52:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E5=85=88=E9=94=8B=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datastats/impl/DataStatsServiceImpl.java  |  3 ++
 .../extract/FactOriginGroupMainDailyDao.xml   | 19 ++++++----
 .../extract/FactOriginGroupMemberDailyDao.xml | 38 +++++++++++--------
 .../extract/FactOriginIssueMainDailyDao.xml   | 19 ++++++----
 .../extract/FactOriginProjectMainDailyDao.xml | 38 ++++++++++++-------
 .../extract/FactOriginTopicMainDailyDao.xml   | 19 ++++++----
 6 files changed, 85 insertions(+), 51 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index 72a5501eb8..0bf1504b81 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -1011,6 +1011,9 @@ public class DataStatsServiceImpl implements DataStatsService {
     public PartyMemberVanguardRankResultDTO vanguardRank(PartyMemberVanguardFormDTO formDTO) {
         //获取组织级别
         DimAgencyEntity agency = dataStatsDao.getAgencyInfo(formDTO.getAgencyId());
+        if (null == agency) {
+        	return new PartyMemberVanguardRankResultDTO();
+		}
         //组织排行
         List<PartyMemberVanguardDetailResultDTO> agencyRank = dataStatsDao.selectAgencyVanguardRank(formDTO.getAgencyId());
         //网格排行
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml
index eeec0fa8e5..21df7f9a68 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml
@@ -352,16 +352,19 @@
     </select>
     <select id="selectPartyMemberGroupStaticByAgency" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
-        AGENCY_ID,
-        count( ID ) AS "sum",
-        sum(IF( IS_OWNER_PARTY = 1, 1, 0 )) AS "count"
+            a.ID AS AGENCY_ID,
+            count( b.ID ) AS "sum",
+            sum( IF( IS_OWNER_PARTY = 1, 1, 0 )) AS "count"
         FROM
-        fact_origin_group_main_daily
-        WHERE CUSTOMER_ID = #{customerId}
-        AND DATE_ID &lt;= #{dateId}
-        AND (GROUP_STATE = 'approved' OR GROUP_STATE = 'hidden')
+            dim_agency a
+        INNER JOIN
+            fact_origin_group_main_daily b ON b.PIDS LIKE CONCAT( '%', a.ID, '%' )
+        WHERE
+            b.CUSTOMER_ID = #{customerId}
+            AND b.DATE_ID &lt;= #{dateId}
+            AND ( GROUP_STATE = 'approved' OR GROUP_STATE = 'hidden' )
         GROUP BY
-        AGENCY_ID
+            a.ID
     </select>
     <select id="selectPartyMemberGroupStaticByGrid" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMemberDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMemberDailyDao.xml
index c0fb2fb43c..bb5fc4b2e5 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMemberDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMemberDailyDao.xml
@@ -29,25 +29,33 @@
     </resultMap>
     <select id="selectGroupPartyMemberStaticByAgency" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
-            a.AGENCY_ID,
+            da.ID AS AGENCY_ID,
             COUNT( DISTINCT MEMBER_ID ) AS "sum",
             IFNULL( b.partyCount, 0 ) AS "count"
         FROM
-            fact_origin_group_member_daily a
-                LEFT JOIN
-            (SELECT
-                 AGENCY_ID,
-                 COUNT( DISTINCT MEMBER_ID ) AS partyCount
-             FROM fact_origin_group_member_daily
-             WHERE IS_PARTY = 1
-                 AND CUSTOMER_ID = #{customerId}
-                 AND DATE_ID &lt;= #{dateId}
-             GROUP BY AGENCY_ID
-            ) b ON a.AGENCY_ID = b.AGENCY_ID
-        WHERE a.CUSTOMER_ID = #{customerId}
-          AND a.DATE_ID &lt;= #{dateId}
+            dim_agency da
+        INNER JOIN fact_origin_group_member_daily a ON a.PIDS LIKE CONCAT( '%', da.ID, '%' )
+        AND a.CUSTOMER_ID = #{customerId}
+        AND a.DATE_ID &lt;= #{dateId}
+        LEFT JOIN (
+            SELECT
+                agency.ID AS AGENCY_ID,
+                COUNT( DISTINCT MEMBER_ID ) AS partyCount
+            FROM
+            dim_agency agency
+            INNER JOIN fact_origin_group_member_daily member ON member.PIDS LIKE CONCAT( '%', agency.ID, '%' )
+                AND member.IS_PARTY = 1
+                AND member.CUSTOMER_ID = #{customerId}
+                AND member.DATE_ID &lt;= #{dateId}
+            WHERE
+                agency.CUSTOMER_ID = #{customerId}
+            GROUP BY
+                agency.ID
+        ) b ON da.ID = b.AGENCY_ID
+        WHERE
+            da.CUSTOMER_ID = #{customerId}
         GROUP BY
-            a.AGENCY_ID
+            da.ID
     </select>
     <select id="selectGroupPartyMemberStaticByGrid" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml
index a488706d0b..d5bbf0cc29 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml
@@ -293,13 +293,18 @@
     </select>
     <select id="selectPartyMemberIssueStaticByAgency" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
-            AGENCY_ID,
-            COUNT(ID) AS "sum",
-            SUM(IF(IS_PARTY = 1 ,1, 0)) AS "count"
-        FROM fact_origin_issue_main_daily
-        WHERE CUSTOMER_ID = #{customerId}
-          AND DATE_ID &lt;= #{dateId}
-        GROUP BY AGENCY_ID
+            a.ID AS AGENCY_ID,
+            count( b.ID ) AS "sum",
+            sum( IF( IS_PARTY = 1, 1, 0 )) AS "count"
+        FROM
+            dim_agency a
+                INNER JOIN
+            fact_origin_issue_main_daily b ON b.PIDS LIKE CONCAT( '%', a.ID, '%' )
+        WHERE
+            b.CUSTOMER_ID = #{customerId}
+          AND b.DATE_ID &lt;= #{dateId}
+        GROUP BY
+            a.ID
     </select>
     <select id="selectPartyMemberIssueStaticByGrid" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
index 9213e3c855..c9d6d8bfde 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
@@ -763,14 +763,19 @@
     </select>
     <select id="selectPartyMemberProjectStaticByAgency" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
-            AGENCY_ID,
-            COUNT(ID) AS "sum",
-            SUM(IF(IS_PARTY = 1 ,1, 0)) AS "count"
-        FROM fact_origin_project_main_daily
-        WHERE CUSTOMER_ID = #{customerId}
-          AND DATE_ID &lt;= #{dateId}
+            a.ID AS AGENCY_ID,
+            count( b.ID ) AS "sum",
+            sum( IF( IS_PARTY = 1, 1, 0 )) AS "count"
+        FROM
+            dim_agency a
+                INNER JOIN
+            fact_origin_project_main_daily b ON b.PIDS LIKE CONCAT( '%', a.ID, '%' )
+        WHERE
+            b.CUSTOMER_ID = #{customerId}
+          AND b.DATE_ID &lt;= #{dateId}
           AND ORIGIN = 'issue'
-        GROUP BY AGENCY_ID
+        GROUP BY
+            a.ID
     </select>
     <select id="selectPartyMemberProjectStaticByGrid" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
@@ -785,15 +790,20 @@
     </select>
     <select id="selectPartyMemberClosedProjectStaticByAgency" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
-            AGENCY_ID,
-            COUNT(ID) AS "sum",
-            SUM(IF(IS_PARTY = 1 ,1, 0)) AS "count"
-        FROM fact_origin_project_main_daily
-        WHERE CUSTOMER_ID = #{customerId}
-          AND DATE_ID &lt;= #{dateId}
+            a.ID AS AGENCY_ID,
+            count( b.ID ) AS "sum",
+            sum( IF( IS_PARTY = 1, 1, 0 )) AS "count"
+        FROM
+            dim_agency a
+                INNER JOIN
+            fact_origin_project_main_daily b ON b.PIDS LIKE CONCAT( '%', a.ID, '%' )
+        WHERE
+            b.CUSTOMER_ID = #{customerId}
+          AND b.DATE_ID &lt;= #{dateId}
           AND PROJECT_STATUS = 'closed'
           AND ORIGIN = 'issue'
-        GROUP BY AGENCY_ID
+        GROUP BY
+            a.ID
     </select>
     <select id="selectPartyMemberClosedProjectStaticByGrid" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml
index 59bc2006c0..2ee9f8afe1 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml
@@ -192,13 +192,18 @@
     </select>
     <select id="selectPartyMemberTopicStaticByAgency" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
-            AGENCY_ID,
-            COUNT(ID) as "sum",
-            SUM(IF(CREATE_TOPIC_USER_IS_PARTY = 1 ,1, 0)) as "count"
-        FROM fact_origin_topic_main_daily
-        WHERE CUSTOMER_ID = #{customerId}
-          AND DATE_ID &lt;= #{dateId}
-        GROUP BY AGENCY_ID
+            a.ID AS AGENCY_ID,
+            count( b.ID ) AS "sum",
+            sum( IF( CREATE_TOPIC_USER_IS_PARTY = 1, 1, 0 )) AS "count"
+        FROM
+            dim_agency a
+                INNER JOIN
+            fact_origin_topic_main_daily b ON b.PIDS LIKE CONCAT( '%', a.ID, '%' )
+        WHERE
+            b.CUSTOMER_ID = #{customerId}
+          AND b.DATE_ID &lt;= #{dateId}
+        GROUP BY
+            a.ID
     </select>
     <select id="selectPartyMemberTopicStaticByGrid" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT