Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev

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);

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,
+            a.ID AS AGENCY_ID,
-        b.`LEVEL`,
+            a.`LEVEL`,
-        COUNT( b.ID ) AS "sum",
+            COUNT( b.PROJECT_ID ) AS "sum",
-        SUM(
+          SUM(IF( b.ORG_TYPE = 'department', 1, 0 )) AS "count"
-        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
         FROM
-        fact_origin_project_main_daily a
+            dim_agency a
-        INNER JOIN fact_origin_project_log_daily b ON a.ID = b.PROJECT_ID
+            INNER JOIN (
-        AND b.ACTION_CODE = 'close'
+            SELECT
-        INNER JOIN dim_agency c ON b.AGENCY_ID = c.ID
+                PROJECT_ID,
-        WHERE
+                PIDS,
-        a.CUSTOMER_ID = #{customerId}
+                ORG_TYPE
-        AND a.DATE_ID &lt;= #{dateId}
+            FROM
-        AND a.PROJECT_STATUS = 'closed'
+                fact_origin_project_log_daily
-        ) b ON b.PIDS LIKE CONCAT( '%', a.ID, '%' )
+            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,
+            a.ID,
-        b.`LEVEL`
+            a.`LEVEL`
     </select>