From f65653979f9db551a83ce16dbd049dcc4ebeae3c Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 30 Sep 2020 15:54:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8E=BB=E9=99=A4round?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/controller/DemoController.java  | 23 ++++++++++++-------
 .../extract/FactOriginTopicMainDailyDao.xml   |  2 +-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
index 9cfdb628ec..eeb5758d08 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
@@ -496,20 +496,20 @@ public class DemoController {
     @PostMapping("streetZxc")
     public void getStreet(){
         String customerId = "b09527201c4409e19d1dbc5e3c3429a1";
-        String monthId = "202008";
+        String monthId = "202009";
         indexCalculateStreetService.calStreetAll(customerId,monthId);
     }
 
     @PostMapping("districtZxc")
     public void getDistrict(){
         String customerId = "45687aa479955f9d06204d415238f7cc";
-        String monthId = "202008";
+        String monthId = "202009";
         indexCalculateDistrictService.calDistrictAll(customerId,monthId);
     }
     @PostMapping("gridZxc")
     public void getGrid(){
         String customerId = "b09527201c4409e19d1dbc5e3c3429a1";
-        String monthId = "202008";
+        String monthId = "202009";
         CalculateCommonFormDTO c = new CalculateCommonFormDTO();
         c.setCustomerId(customerId);
         c.setMonthId(monthId);
@@ -518,7 +518,7 @@ public class DemoController {
     @PostMapping("deptZxc")
     public void getDept(){
         String customerId = "b09527201c4409e19d1dbc5e3c3429a1";
-        String monthId = "202008";
+        String monthId = "202009";
         CalculateCommonFormDTO c = new CalculateCommonFormDTO();
         c.setCustomerId(customerId);
         c.setMonthId(monthId);
@@ -564,20 +564,27 @@ public class DemoController {
 
     @PostMapping("gridparty")
     public void gridParty(){
-        String customerId = "3ef7e4bb195eb9e622d68b52509aa940";
+        String customerId = "45687aa479955f9d06204d415238f7cc";
 //        String customerId = "epmettest";
-        String monthId = "202008";
+        String monthId = "202009";
         calGridIndexService.calGridIndexPartyAbility(customerId,monthId);
     }
 
     @PostMapping("gridgovern")
     public void gridGovern(){
-        String customerId = "3ef7e4bb195eb9e622d68b52509aa940";
+        String customerId = "45687aa479955f9d06204d415238f7cc";
 //        String customerId = "epmettest";
-        String monthId = "202008";
+        String monthId = "202009";
         calGridIndexService.calGridIndexGovernAbility(customerId,monthId);
     }
 
+    @PostMapping("gridservice")
+    public void gridService(){
+        String customerId = "45687aa479955f9d06204d415238f7cc";
+        String monthId = "202009";
+        calGridIndexService.calGridIndexServiceAbility(customerId,monthId);
+    }
+
     @PostMapping("handlemap")
     public Result<Map<String,Integer>> handleMap(){
         return new  Result<Map<String,Integer>>().ok(
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 40b67c3951..c05217083f 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
@@ -85,7 +85,7 @@
     <!-- 查询网格 党员/群众 人均提出话题数 -->
     <select id="selectCreateTopicCount" resultType="com.epmet.dto.extract.result.CreateTopicCountResultDTO">
         SELECT
-            ROUND(( COUNT( ID ) / COUNT( DISTINCT ( CREATE_TOPIC_USER_ID ))), 0 ) AS createTopicCount,
+            ( COUNT( ID ) / COUNT( DISTINCT ( CREATE_TOPIC_USER_ID ))) AS createTopicCount,
             GRID_ID
         FROM
             fact_origin_topic_main_daily

From 92bfe503dd97027001417018526d28a50bcbc28f Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Wed, 30 Sep 2020 16:59:57 +0800
Subject: [PATCH 2/2] =?UTF-8?q?orgRank=20=E5=8A=A0=E4=B8=8AallParentIds?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/ScreenOrgRankDataDao.xml             | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenOrgRankDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenOrgRankDataDao.xml
index 95b8e20845..d60557da81 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenOrgRankDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenOrgRankDataDao.xml
@@ -31,6 +31,7 @@
             'agency' AS ORG_TYPE,
             ID AS ORG_ID,
             PID AS PARENT_ID,
+            PIDS AS allParentIds,
             AGENCY_NAME AS ORG_NAME,
             0 AS PARTY_TOTAL,
             0 AS GROUP_TOTAL,
@@ -48,22 +49,24 @@
     </select>
     <select id="initGridDataList" resultType="com.epmet.entity.evaluationindex.screen.ScreenOrgRankDataEntity">
         SELECT DISTINCT
-            CUSTOMER_ID,
+            gr.CUSTOMER_ID,
             'grid' AS ORG_TYPE,
-            ID AS ORG_ID,
-            AGENCY_ID AS PARENT_ID,
-            GRID_NAME AS ORG_NAME,
+            gr.ID AS ORG_ID,
+            gr.AGENCY_ID AS PARENT_ID,
+            gr.GRID_NAME AS ORG_NAME,
             0 AS PARTY_TOTAL,
             0 AS GROUP_TOTAL,
             0 AS TOPIC_TOTAL,
             0 AS ISSUE_TOTAL,
             0 AS PROJECT_TOTAL,
             0 AS CLOSE_PROJECT_RATIO,
-            0 AS SATISFACTION_RATIO
+            0 AS SATISFACTION_RATIO,
+            CONCAT(IF(ISNULL( ag.PIDS ) || LENGTH( trim( ag.PIDS ) ) <![CDATA[<]]> 1,'',CONCAT(ag.PIDS,':')),ag.ID) AS allParentIds
         FROM
-            dim_grid
+            dim_grid gr
+            LEFT JOIN dim_agency ag ON gr.AGENCY_ID = ag.ID AND ag.CUSTOMER_ID = #{customerId}
         WHERE
-            CUSTOMER_ID = #{customerId}
+            gr.CUSTOMER_ID = #{customerId}
     </select>
 
     <insert id="batchInsertOrgRankData" parameterType="map">