From 4e28b7cc50243aaa6adae0816f8e41aaa5fd4843 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Wed, 1 Dec 2021 15:57:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B2=BB=E7=90=86=E8=83=BD=E5=8A=9B-=E8=A1=97?=
 =?UTF-8?q?=E9=81=93=E5=8F=8A=E7=A4=BE=E5=8C=BA=E7=9B=B8=E5=85=B3-?=
 =?UTF-8?q?=E5=8A=9E=E7=BB=93=E6=95=B0=E7=BB=9F=E8=AE=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extract/FactOriginProjectLogDailyDao.xml  | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml
index 9c8a44612f..64682b5dd4 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml
@@ -266,24 +266,26 @@
     </select>
     <!-- 查询机关办结次数 -->
     <select id="selectAgencyHandledProjectCount" resultType="com.epmet.dto.extract.result.ProjectParticipatedAgencyResultDTO">
-        	SELECT
-                SUBSTRING_INDEX(main.FINISH_ORG_IDS,':',1) AS agencyId,
-                COUNT(main.ID) AS count
-				FROM fact_origin_project_main_daily main
-				LEFT JOIN fact_origin_project_log_daily log
-                ON main.ID = log.PROJECT_ID AND log.DEL_FLAG = '0' AND log.ACTION_CODE = 'close'
-				WHERE main.DEL_FLAG = '0'
-				AND main.CUSTOMER_ID = #{customerId}
-                <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},'%')
-                    </foreach>
-                </if>
-
-                <if test='null != dimId and "" != dimId.trim()'>
-                    AND log.ID IS NOT NULL AND log.MONTH_ID  =  #{dimId}
-                </if>
-                GROUP BY SUBSTRING_INDEX(main.FINISH_ORG_IDS,':',1)
+        SELECT
+            ORG_ID AS "agencyId",
+            COUNT( PROJECT_ID ) AS count
+        FROM
+            fact_origin_project_log_daily
+        WHERE
+            DEL_FLAG = '0'
+            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=" ) ">
+                      ORG_ID = #{item}
+                </foreach>
+            </if>
+            <if test='null != dimId and "" != dimId.trim()'>
+                AND MONTH_ID  =  #{dimId}
+            </if>
+        GROUP BY
+            ORG_ID
     </select>
     <!-- 查询评价周期内各级别机关办结的项目Id -->
     <select id="selectProjectIdHandledByAgency" resultType="com.epmet.dto.extract.result.ProjectParticipatedAgencyResultDTO">