From 2e6b6b0ee16290c649c5e8040a4cafc8117db671 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 23 Sep 2020 14:24:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E6=95=B0=E6=8D=AE=E6=8A=BD?=
 =?UTF-8?q?=E5=8F=96=E6=B7=BB=E5=8A=A0pids?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/stats/form/DimCustomerPartyMemberFormDTO.java    | 2 ++
 .../com/epmet/dto/stats/result/GridBelongAgencyResultDTO.java  | 2 ++
 .../service/stats/impl/DimCustomerPartymemberServiceImpl.java  | 1 +
 .../main/resources/mapper/stats/DimCustomerPartymemberDao.xml  | 2 ++
 .../src/main/resources/mapper/stats/DimGridDao.xml             | 3 ++-
 5 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/form/DimCustomerPartyMemberFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/form/DimCustomerPartyMemberFormDTO.java
index 9a57ade5e6..8ff5479b0f 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/form/DimCustomerPartyMemberFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/form/DimCustomerPartyMemberFormDTO.java
@@ -35,6 +35,8 @@ public class DimCustomerPartyMemberFormDTO implements Serializable {
      */
     private String parentId;
 
+    private String pids;
+
     /**
      * 党员认证成功的日期yyyyMMdd
      */
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/result/GridBelongAgencyResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/result/GridBelongAgencyResultDTO.java
index a04c5fe2b4..16f870e85e 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/result/GridBelongAgencyResultDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/result/GridBelongAgencyResultDTO.java
@@ -27,4 +27,6 @@ public class GridBelongAgencyResultDTO implements Serializable {
      * 机关的上级ID
      */
     private String parentId;
+
+    private String pids;
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimCustomerPartymemberServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimCustomerPartymemberServiceImpl.java
index 86fd72a3ca..62cefb9ffa 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimCustomerPartymemberServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimCustomerPartymemberServiceImpl.java
@@ -154,6 +154,7 @@ public class DimCustomerPartymemberServiceImpl extends BaseServiceImpl<DimCustom
                     if (party.getGridId().equals(agency.getGridId())){
                         party.setAgencyId(agency.getAgencyId());
                         party.setParentId(agency.getParentId());
+                        party.setPids(agency.getPids());
                     }
                 });
             });
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/DimCustomerPartymemberDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/DimCustomerPartymemberDao.xml
index c886a90095..252fcad8b2 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/DimCustomerPartymemberDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/DimCustomerPartymemberDao.xml
@@ -11,6 +11,7 @@
             GRID_ID,
             AGENCY_ID,
             PARENT_ID,
+            PIDS,
             DATE_ID,
             WEEK_ID,
             MONTH_ID,
@@ -34,6 +35,7 @@
                 #{item.gridId},
                 #{item.agencyId},
                 #{item.parentId},
+                #{item.pids},
                 #{item.dateId},
                 #{item.weekId},
                 #{item.monthId},
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/DimGridDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/DimGridDao.xml
index bbc7e463e1..8b74563b15 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/DimGridDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/DimGridDao.xml
@@ -74,7 +74,8 @@
         SELECT
             dg.id AS gridId,
             dg.AGENCY_ID AS agencyId,
-            da.PID AS parentId
+            da.PID AS parentId,
+            da.pids
         FROM
             dim_grid dg
             LEFT JOIN dim_agency da ON da.id = dg.agency_id