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 1/2] =?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 2/2] =?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);