From 15813222f6014ea3e4fb091b81a2e3f632578236 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Sat, 4 Dec 2021 17:20:01 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=8C=BA=E7=9B=B4=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E6=B2=BB=E7=90=86=E8=83=BD=E5=8A=9B=E6=B7=BB=E5=8A=A0=E5=88=B0?=
 =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IndexOriginExtractServiceImpl.java   | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexOriginExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexOriginExtractServiceImpl.java
index b1e48c25d5..6bc96d1006 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexOriginExtractServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexOriginExtractServiceImpl.java
@@ -42,7 +42,8 @@ public class IndexOriginExtractServiceImpl implements IndexOriginExtractService
     private IndexCollCommunityService indexCollCommunityService;
     @Autowired
     private IndexCollDistrictService indexCollDistrictService;
-
+    @Autowired
+     private IndexCollDistrictDepartmentService indexCollDistrictDepartmentService;
     /**
      * desc：从统计库对象抽取指标数据
      *
@@ -117,6 +118,15 @@ public class IndexOriginExtractServiceImpl implements IndexOriginExtractService
             } catch (Exception e) {
                 log.error("抽取【网格服务能力数据】发生异常,参数:" + JSON.toJSONString(param), e);
             }
+
+            try{
+                //dimAgency
+                long startCommunity = System.currentTimeMillis();
+                indexCollCommunityService.saveCommunityAbility(customerId, monthId);
+                log.error("社区相关-三大能力执行完毕======总耗时:{}ms，customerId:{}",System.currentTimeMillis()-startCommunity, param.getCustomerId());
+            }catch (Exception e){
+                log.error("抽取【社区治理能力-社区党建能力-服务能力】发生异常,参数:" + JSON.toJSONString(param), e);
+            }
             try{
                 //dimAgency
                 long startStreet = System.currentTimeMillis();
@@ -125,14 +135,18 @@ public class IndexOriginExtractServiceImpl implements IndexOriginExtractService
             }catch (Exception e){
                 log.error("抽取【街道治理能力-街道党建能力-服务能力】发生异常,参数:" + JSON.toJSONString(param), e);
             }
+
+
             try{
                 //dimAgency
-                long startCommunity = System.currentTimeMillis();
-                indexCollCommunityService.saveCommunityAbility(customerId, monthId);
-                log.error("街道相关-三大能力执行完毕======总耗时:{}ms，customerId:{}",System.currentTimeMillis()-startCommunity, param.getCustomerId());
+                long startDept = System.currentTimeMillis();
+                indexCollDistrictDepartmentService.saveDepartmentAbility(customerId, monthId);
+                log.error("区直部门相关-治理能力执行完毕======总耗时:{}ms，customerId:{}",System.currentTimeMillis()-startDept, param.getCustomerId());
             }catch (Exception e){
-                log.error("抽取【社区治理能力-社区党建能力-服务能力】发生异常,参数:" + JSON.toJSONString(param), e);
+                log.error("抽取【区直部门治理能力】发生异常,参数:" + JSON.toJSONString(param), e);
             }
+
+
             try{
                 //dimAgency
                 long startDistrict = System.currentTimeMillis();

From 6c9ec4c421a7665e219796e9045174a3990881c9 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Sat, 4 Dec 2021 19:32:51 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=B2=BB=E7=90=86=E6=8C=87=E6=95=B0-?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=8E=87=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extract/FactOriginProjectMainDailyDao.xml | 46 ++++++++-----------
 1 file changed, 20 insertions(+), 26 deletions(-)

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 b8560a06a1..07226b1c40 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
@@ -979,35 +979,29 @@
     </select>
     <select id="selectAgencyClosedProjectStaticDaily" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
-        a.ID AS AGENCY_ID,
-        b.`LEVEL`,
-        COUNT( b.ID ) AS "sum",
-        SUM(
-        IF
-        ( b.ORG_TYPE = 'department', 1, 0 )) AS "count"
-        FROM
-        dim_agency a
-        INNER JOIN (
-        SELECT
-        a.ID,
-        a.PIDS,
-        c.`LEVEL`,
-        b.ORG_TYPE
+            a.ID AS AGENCY_ID,
+            a.`LEVEL`,
+            COUNT( b.PROJECT_ID ) AS "sum",
+          SUM(IF( b.ORG_TYPE = 'department', 1, 0 )) AS "count"
         FROM
-        fact_origin_project_main_daily a
-        INNER JOIN fact_origin_project_log_daily b ON a.ID = b.PROJECT_ID
-        AND b.ACTION_CODE = 'close'
-        INNER JOIN dim_agency c ON b.AGENCY_ID = c.ID
-        WHERE
-        a.CUSTOMER_ID = #{customerId}
-        AND a.DATE_ID &lt;= #{dateId}
-        AND a.PROJECT_STATUS = 'closed'
-        ) b ON b.PIDS LIKE CONCAT( '%', a.ID, '%' )
+            dim_agency a
+            INNER JOIN (
+            SELECT
+                PROJECT_ID,
+                PIDS,
+                ORG_TYPE
+            FROM
+                fact_origin_project_log_daily
+            WHERE
+                CUSTOMER_ID = #{customerId}
+                AND DATE_ID &lt;= #{dateId}
+                AND ACTION_CODE = 'close'
+            ) b ON b.PIDS LIKE CONCAT( '%', a.ID, '%' )
         WHERE
-        a.CUSTOMER_ID = #{customerId}
+            a.CUSTOMER_ID = #{customerId}
         GROUP BY
-        a.ID,
-        b.`LEVEL`
+            a.ID,
+            a.`LEVEL`
     </select>
 
 

From 9bf485643d6404da9514b089c699737ee9988f39 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Sat, 4 Dec 2021 20:08:58 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=E5=85=9A=E5=91=98=E7=9B=B8=E5=85=B3-=E5=85=9A=E5=BB=BA?=
 =?UTF-8?q?=E8=83=BD=E5=8A=9B=E6=8A=BD=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extract/dataToIndex/impl/IndexOriginExtractServiceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexOriginExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexOriginExtractServiceImpl.java
index 6bc96d1006..52b1cdfc11 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexOriginExtractServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexOriginExtractServiceImpl.java
@@ -88,7 +88,7 @@ public class IndexOriginExtractServiceImpl implements IndexOriginExtractService
         threadPool.submit(() -> {
             try {
                 long startCpc = System.currentTimeMillis();
-                calCpcIndexService.calCpcPartyAbility(customerId, monthId);
+                //calCpcIndexService.calCpcPartyAbility(customerId, monthId);
                 log.error("党员相关-党建能力执行完毕======总耗时:{}ms，customerId:{}",System.currentTimeMillis()-startCpc, param.getCustomerId());
             } catch (Exception e) {
                 log.error("抽取【党员相关数据】发生异常,参数:" + JSON.toJSONString(param), e);

From dc3abe7b04bfa0870fe3eaf8c3d0c671c107f539 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Sat, 4 Dec 2021 21:04:26 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E8=AE=AE=E9=A2=98?=
 =?UTF-8?q?=E8=BD=AC=E9=A1=B9=E7=9B=AE=E7=8E=87=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=EF=BC=9A=E8=AE=AE=E9=A2=98=E5=88=9B=E5=BB=BA=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=20=E8=80=8C=E4=B8=8D=E6=98=AF=E8=BD=AC=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=9A=84=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extract/FactOriginIssueMainDailyDao.xml    | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

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 6ee2643f68..638f7ec8df 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
@@ -167,13 +167,15 @@
     <!-- 查询议题转项目总数 -->
     <select id="selectIssueTotalShiftProject" resultType="com.epmet.dto.extract.form.GridIssueCountResultDTO">
         SELECT
-            GRID_ID,
-            COUNT(ISSUE_ID) AS issueTotal
-        FROM fact_origin_issue_log_daily
-        WHERE DEL_FLAG = '0'
-          AND MONTH_ID = #{monthId}
-          AND CUSTOMER_ID = #{customerId}
-          AND ACTION_CODE = 'shift_project'
+            m.GRID_ID,
+            COUNT(m.ID) AS issueTotal
+        FROM
+            fact_origin_issue_main_daily m INNER JOIN
+            fact_origin_issue_log_daily l ON  m.ID = l.ISSUE_ID
+        WHERE m.DEL_FLAG = '0'
+          AND m.MONTH_ID = #{monthId}
+          AND m.CUSTOMER_ID = #{customerId}
+          AND l.ACTION_CODE = 'shift_project'
         GROUP BY GRID_ID
     </select>
 
@@ -376,4 +378,4 @@
         GROUP BY
             a.ID
     </select>
-</mapper>
\ No newline at end of file
+</mapper>