治理能力-街道及社区相关-办结数统计修改

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml

@@ -267,23 +267,25 @@
     <!-- 查询机关办结次数 -->
     <select id="selectAgencyHandledProjectCount" resultType="com.epmet.dto.extract.result.ProjectParticipatedAgencyResultDTO">
         SELECT
-                SUBSTRING_INDEX(main.FINISH_ORG_IDS,':',1) AS agencyId,
+            ORG_ID AS "agencyId",
-                COUNT(main.ID) AS count
+            COUNT( PROJECT_ID ) AS count
-				FROM fact_origin_project_main_daily main
+        FROM
-				LEFT JOIN fact_origin_project_log_daily log
+            fact_origin_project_log_daily
-                ON main.ID = log.PROJECT_ID AND log.DEL_FLAG = '0' AND log.ACTION_CODE = 'close'
+        WHERE
-				WHERE main.DEL_FLAG = '0'
+            DEL_FLAG = '0'
-				AND main.CUSTOMER_ID = #{customerId}
+            AND ACTION_CODE = 'close'
+            AND CUSTOMER_ID = #{customerId}
+            AND ORG_TYPE = 'agency'
             <if test="null != agencies and agencies.size() > 0">
                 <foreach collection="agencies" item="item" open="AND ( " separator=" OR " close=" ) ">
-                          main.FINISH_ORG_IDS LIKE  concat(#{item},'%')
+                      ORG_ID = #{item}
                 </foreach>
             </if>
-
             <if test='null != dimId and "" != dimId.trim()'>
-                    AND log.ID IS NOT NULL AND log.MONTH_ID  =  #{dimId}
+                AND MONTH_ID  =  #{dimId}
             </if>
-                GROUP BY SUBSTRING_INDEX(main.FINISH_ORG_IDS,':',1)
+        GROUP BY
+            ORG_ID
     </select>
     <!-- 查询评价周期内各级别机关办结的项目Id -->
     <select id="selectProjectIdHandledByAgency" resultType="com.epmet.dto.extract.result.ProjectParticipatedAgencyResultDTO">