From e20b977f9bbca41e8b41b64ac566528526d93e74 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Fri, 16 Oct 2020 16:56:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E5=90=B9=E5=93=A8=E6=AC=A1=E6=95=B0?=
 =?UTF-8?q?=E3=80=81=E5=90=B9=E5=93=A8=E9=A1=B9=E7=9B=AE=E6=95=B0=E7=9A=84?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extract/FactOriginProjectLogDailyDao.java |   2 +-
 .../impl/IndexCollCommunityServiceImpl.java   |  21 +-
 .../impl/IndexCollDistrictServiceImpl.java    |  19 +-
 .../impl/IndexCollStreetServiceImpl.java      |  19 +-
 .../FactOriginProjectLogDailyService.java     |   4 +-
 .../FactOriginProjectLogDailyServiceImpl.java |  22 ++-
 .../extract/FactOriginProjectLogDailyDao.xml  | 182 ++++++++++++++----
 7 files changed, 179 insertions(+), 90 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java
index a4ef520287..500fd52d48 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java
@@ -117,7 +117,7 @@ public interface FactOriginProjectLogDailyDao extends BaseDao<FactOriginProjectL
 	List<ProjectParticipatedAgencyResultDTO> selectProjectParticipatedAgency(@Param("agencies") List<String> agencies, @Param("customerId") String customerId,@Param("dimId") String dimId);
 
 	/***
-	 * @Description 评价周期内被吹哨次数
+	 * @Description 评价周期内被吹哨项目数
 	 * @param agencies
 	 * @param customerId
 	 * @param dimId
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexCollCommunityServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexCollCommunityServiceImpl.java
index d8c024085b..062990b4ed 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexCollCommunityServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexCollCommunityServiceImpl.java
@@ -138,24 +138,15 @@ public class IndexCollCommunityServiceImpl implements IndexCollCommunityService
 		List<String> agencies = agencyList.stream().map(DimAgencyDTO :: getId).distinct().collect(Collectors.toList());
 		//办结数
 		Map<String, Integer> agencyHandleCount = factOriginProjectLogDailyService.getProjectHandledAgency(agencies,customerId,dimId.getMonthId(),"month");
-		////评价周期内被吹哨且被办结(无论是哪一级办结)的项目数
-		Map<String, Integer> whistledAgencyClosedProject = factOriginProjectLogDailyService.getWhistledAgencyClosedProjectCount(agencies,customerId,dimId.getMonthId(),"month");
+		//办结率
+		Map<String, BigDecimal> handlingRatioMap = factOriginProjectLogDailyService.getHandlingRatio(agencies,customerId,dimId.getMonthId(),"month");
 		//处理效率
 		Map<String,BigDecimal> efficiencyMap = factOriginProjectLogDailyService.getAgencyWorkPieceRatio(customerId,dimId.getMonthId(),"month");
 		list.forEach(entity ->{
-			entity.setClosedProjectCount(agencyHandleCount.get(entity.getAgencyId()) == null? NumConstant.ZERO : agencyHandleCount.get(entity.getAgencyId()));
-			BigDecimal element = new BigDecimal(Optional.ofNullable(whistledAgencyClosedProject.get(entity.getAgencyId())).orElse(NumConstant.ZERO));
-			//分母，即机关参与过的项目数（去重）
-			//“评价周期内被吹哨且办结的项目数”/“评价周期内被吹哨的所有项目数”
-			Integer denominator = entity.getTransferedCount();
-			if (null != denominator && denominator != NumConstant.ZERO) {
-				//办结率
-				entity.setClosedProjectRatio(
-						element.divide(new BigDecimal(denominator), NumConstant.SIX, RoundingMode.HALF_UP)
-				);
-			}else{
-				entity.setClosedProjectRatio(BigDecimal.ZERO);
-			}
+			//办结数
+			entity.setClosedProjectCount(Optional.ofNullable(agencyHandleCount.get(entity.getAgencyId())).orElse(NumConstant.ZERO));
+			//办结率
+			entity.setClosedProjectRatio(Optional.ofNullable(handlingRatioMap.get(entity.getAgencyId())).orElse(BigDecimal.ZERO));
 			//办结效率
 			entity.setHandleProjectRatio(Optional.ofNullable(efficiencyMap.get(entity.getAgencyId())).orElse(BigDecimal.ZERO));
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexCollDistrictServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexCollDistrictServiceImpl.java
index 5271e87177..aeaa04000c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexCollDistrictServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexCollDistrictServiceImpl.java
@@ -131,24 +131,15 @@ public class IndexCollDistrictServiceImpl implements IndexCollDistrictService {
 		List<String> agencies = agencyList.stream().map(DimAgencyDTO :: getId).distinct().collect(Collectors.toList());
 		//办结数
 		Map<String, Integer> agencyHandleCount = factOriginProjectLogDailyService.getProjectHandledAgency(agencies,customerId,dimId.getMonthId(),"month");
-		//评价周期内被吹哨且被办结(无论是哪一级办结)的项目数
-		Map<String, Integer> whistledAgencyClosedProject = factOriginProjectLogDailyService.getWhistledAgencyClosedProjectCount(agencies,customerId,dimId.getMonthId(),"month");
+		//办结率
+		Map<String, BigDecimal> handlingRatioMap = factOriginProjectLogDailyService.getHandlingRatio(agencies,customerId,dimId.getMonthId(),"month");
 		//处理效率
 		Map<String,BigDecimal> efficiencyMap = factOriginProjectLogDailyService.getAgencyWorkPieceRatio(customerId,dimId.getMonthId(),"month");
 		list.forEach(entity ->{
+			//办结数
 			entity.setClosedProjectCount(agencyHandleCount.get(entity.getAgencyId()) == null? NumConstant.ZERO : agencyHandleCount.get(entity.getAgencyId()));
-			BigDecimal element = new BigDecimal(Optional.ofNullable(whistledAgencyClosedProject.get(entity.getAgencyId())).orElse(NumConstant.ZERO));
-			//分母，即机关参与过的项目数（去重）
-			//“评价周期内被吹哨且办结的项目数”/“评价周期内被吹哨的所有项目数”
-			Integer denominator = entity.getTransferedCount();
-			if (null != denominator && denominator != NumConstant.ZERO) {
-				//办结率
-				entity.setClosedProjectRatio(
-						element.divide(new BigDecimal(denominator), NumConstant.SIX, RoundingMode.HALF_UP)
-				);
-			}else{
-				entity.setClosedProjectRatio(BigDecimal.ZERO);
-			}
+			//办结率
+			entity.setClosedProjectRatio(Optional.ofNullable(handlingRatioMap.get(entity.getAgencyId())).orElse(BigDecimal.ZERO));
 			//办结效率
 			entity.setHandleProjectRatio(Optional.ofNullable(efficiencyMap.get(entity.getAgencyId())).orElse(BigDecimal.ZERO));
 		});
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexCollStreetServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexCollStreetServiceImpl.java
index 6de2c28648..8331905d41 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexCollStreetServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexCollStreetServiceImpl.java
@@ -129,24 +129,15 @@ public class IndexCollStreetServiceImpl implements IndexCollStreetService {
 		List<String> agencies = agencyList.stream().map(DimAgencyDTO :: getId).distinct().collect(Collectors.toList());
 		//办结数
 		Map<String, Integer> agencyHandleCount = factOriginProjectLogDailyService.getProjectHandledAgency(agencies,customerId,dimId.getMonthId(),"month");
-		////评价周期内被吹哨且被办结(无论是哪一级办结)的项目数
-		Map<String, Integer> whistledAgencyClosedProject = factOriginProjectLogDailyService.getWhistledAgencyClosedProjectCount(agencies,customerId,dimId.getMonthId(),"month");
+		//办结率
+		Map<String, BigDecimal> handlingRatioMap = factOriginProjectLogDailyService.getHandlingRatio(agencies,customerId,dimId.getMonthId(),"month");
 		//处理效率
 		Map<String,BigDecimal> efficiencyMap = factOriginProjectLogDailyService.getAgencyWorkPieceRatio(customerId,dimId.getMonthId(),"month");
 		list.forEach(entity ->{
+			//办结数
 			entity.setClosedProjectCount(agencyHandleCount.get(entity.getAgencyId()) == null? NumConstant.ZERO : agencyHandleCount.get(entity.getAgencyId()));
-			BigDecimal element = new BigDecimal(Optional.ofNullable(whistledAgencyClosedProject.get(entity.getAgencyId())).orElse(NumConstant.ZERO));
-			//分母，吹哨次数
-			Integer denominator = entity.getTransferedCount();
-			if (null != denominator && denominator != NumConstant.ZERO) {
-				//办结率
-				//“评价周期内被吹哨且办结的项目数”/“评价周期内被吹哨的所有项目数”
-				entity.setClosedProjectRatio(
-						element.divide(new BigDecimal(denominator), NumConstant.SIX, RoundingMode.HALF_UP)
-				);
-			}else{
-				entity.setClosedProjectRatio(BigDecimal.ZERO);
-			}
+			//办结率
+			entity.setClosedProjectRatio(Optional.ofNullable(handlingRatioMap.get(entity.getAgencyId())).orElse(BigDecimal.ZERO));
 			//办结效率
 			entity.setHandleProjectRatio(Optional.ofNullable(efficiencyMap.get(entity.getAgencyId())).orElse(BigDecimal.ZERO));
 		});
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectLogDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectLogDailyService.java
index 84a4c06392..dbedbb762d 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectLogDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectLogDailyService.java
@@ -178,7 +178,7 @@ public interface FactOriginProjectLogDailyService extends BaseService<FactOrigin
     Map<String,Integer> getProjectHandledAgency(List<String> agencies, String customerId, String dimId,String dateType);
     
     /**
-     * @Description 评价周期内被吹哨且被办结(无论是哪一级办结)的项目数
+     * @Description 办结率
      * @param agencies
      * @param dimId
      * @param dateType - 日期维度类型  month  date  week  quarter year
@@ -186,7 +186,7 @@ public interface FactOriginProjectLogDailyService extends BaseService<FactOrigin
      * @author wangc
      * @date 2020.09.23 10:06
     **/
-    Map<String,Integer> getWhistledAgencyClosedProjectCount(List<String> agencies, String customerId,String dimId,String dateType);
+    Map<String,BigDecimal> getHandlingRatio(List<String> agencies, String customerId,String dimId,String dateType);
 
     /**
      * @Description 计算机关办结项目效率
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectLogDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectLogDailyServiceImpl.java
index 435990bc38..d7c6a7e7de 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectLogDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectLogDailyServiceImpl.java
@@ -184,7 +184,7 @@ public class FactOriginProjectLogDailyServiceImpl extends BaseServiceImpl<FactOr
 
 
     /**
-     * @Description 评价周期内被吹哨且被办结(无论是哪一级办结)的项目数
+     * @Description 办结率
      * @param agencies
      * @param dimId
      * @param dateType - 日期维度类型  month  date  week  quarter year
@@ -193,12 +193,26 @@ public class FactOriginProjectLogDailyServiceImpl extends BaseServiceImpl<FactOr
      * @date 2020.09.23 10:06
      **/
     @Override
-    public Map<String, Integer> getWhistledAgencyClosedProjectCount(List<String> agencies, String customerId,String dimId, String dateType) {
-        Map<String,Integer> result = new HashMap<>();
+    public Map<String, BigDecimal> getHandlingRatio(List<String> agencies, String customerId,String dimId, String dateType) {
+        //计算方式：“评价周期内被吹哨且办结(无论是哪一级办结)的项目数”/“评价周期内被吹哨的所有项目数”
+
+        Map<String,BigDecimal> result = new HashMap<>();
         List<ProjectParticipatedAgencyResultDTO> projectAgencyCount = baseDao.selectWhistledAgencyClosedProjectCount(agencies,customerId,dimId);
         if(!CollectionUtils.isEmpty(projectAgencyCount)){
-           result = projectAgencyCount.stream().collect(Collectors.toMap(ProjectParticipatedAgencyResultDTO::getAgencyId,ProjectParticipatedAgencyResultDTO::getCount));
+            Map<String,Integer> whistledAndHandledProjectTotalMap = projectAgencyCount.stream().collect(Collectors.toMap(ProjectParticipatedAgencyResultDTO::getAgencyId,ProjectParticipatedAgencyResultDTO::getCount));
+            List<ProjectParticipatedAgencyResultDTO> whistledProjectTotal = baseDao.selectAgencyWhistledCount(agencies,customerId,dimId);
+            Map<String,Integer> whistledProjectTotalMap = whistledProjectTotal.stream().collect(Collectors.toMap(ProjectParticipatedAgencyResultDTO::getAgencyId,ProjectParticipatedAgencyResultDTO::getCount));
+            whistledAndHandledProjectTotalMap.forEach((agencyId,count) -> {
+                //分母 被吹哨项目数
+                Integer denominator = whistledProjectTotalMap.get(agencyId);
+                if(null == denominator || NumConstant.ZERO == denominator){
+                    result.put(agencyId,BigDecimal.ZERO);
+                }else{
+                    result.put(agencyId,new BigDecimal(count).divide(new BigDecimal(denominator), NumConstant.SIX, RoundingMode.HALF_UP));
+                }
+            });
         }
+
         return result;
     }
 
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 cc9200ceb1..86551a98e2 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
@@ -138,55 +138,157 @@
             fopld.ORG_ID
     </select>
 
-
+    <!-- 查询各项目处理了多少机关 -->
     <select id="selectProjectParticipatedAgency" resultType="com.epmet.dto.extract.result.ProjectParticipatedAgencyResultDTO">
         SELECT
-        DISTINCT
-        project.ID AS projectId,
-        log.AGENCY_ID,
-        agency.LEVEL,
-        CASE agency.LEVEL WHEN 'community' THEN 1 WHEN 'street' THEN 2 WHEN 'district' THEN 3
-        WHEN 'city' THEN 4 WHEN 'province' THEN 5 END AS score
-
+            AGENCY_ID,
+            COUNT(DISTINCT PROJECT_ID) AS count
         FROM
-        fact_origin_project_main_daily project
-        LEFT JOIN
-        fact_origin_project_log_daily log
-        ON log.PROJECT_ID = project.ID AND log.DEL_FLAG = '0' AND log.IS_ACTIVE = '1'
-        LEFT JOIN
-        dim_object_status dimStatus
-        ON project.PROJECT_STATUS = dimStatus.STATUS_CODE AND dimStatus.DEL_FLAG = '0' AND dimStatus.STATUS_TYPE = 'project'
-        LEFT JOIN
-        dim_object_action dimAction
-        ON log.ACTION_CODE = dimAction.ACTION_CODE AND dimAction.DEL_FLAG = '0' AND dimAction.ACTION_TYPE = 'project'
-        LEFT JOIN
-        dim_agency agency
-        ON log.AGENCY_ID = agency.ID AND agency.DEL_FLAG = '0' AND agency.CUSTOMER_ID = #{customerId}
+        fact_origin_project_log_daily
         WHERE
-        project.DEL_FLAG = '0'
-        AND
-        dimStatus.STATUS_CODE = 'closed'
-        AND
-        dimAction.ACTION_CODE != 'return'
-        AND
-        project.CUSTOMER_ID = #{customerId}
-        <if test='null != dimId and "" != dimId'>
-            <choose>
-                <when test='"month" == dateType'>
-
-                    AND log.MONTH_ID = #{dimId}
-
-                </when>
-                <otherwise>
+        DEL_FLAG = '0'
+        AND CUSTOMER_ID = #{customerId}
+        AND ACTION_CODE IN ('created','transfer','return','response','close')
+        <if test="agencies != null and agencies.size() > 0">
+            <foreach collection="agencies" item="agencyId" open="AND ( " separator=" OR " close=" ) ">
+                AGENCY_ID = #{agencyId}
+            </foreach>
+        </if>
+        <if test='null != dimId and "" != dimId.trim()'>
+            AND MONTH_ID  <![CDATA[>=]]>  #{dimId}
+        </if>
+        GROUP BY AGENCY_ID
+    </select>
 
-                    AND log.DATE_ID = #{dimId}
+    <!-- 评价周期内被吹哨项目数-->
+    <select id="selectAgencyWhistledCount" resultType="com.epmet.dto.extract.result.ProjectParticipatedAgencyResultDTO">
+        SELECT
+            AGENCY_ID,
+            COUNT(DISTINCT PROJECT_ID) AS count
+        FROM
+        fact_origin_project_log_daily
+        WHERE DEL_FLAG = '0'
+        AND CUSTOMER_ID = #{customerId}
+        AND IS_ACTIVE = '0'
+        <if test='null != dimId and "" != dimId.trim()'>
+           AND MONTH_ID = #{dimId}
+           AND NOT EXISTS(
+                SELECT ID
+                FROM fact_origin_project_log_daily
+                WHERE DEL_FLAG = '0'
+                AND MONTH_ID <![CDATA[ < ]]> #{dimId}
+                AND IS_ACTIVE = '0'
+        <if test="agencies != null and agencies.size() > 0">
+                <foreach collection="agencies" item="agencyId" open="AND (" close=" )" separator=" OR ">
+                    AGENCY_ID = #{agencyId}
+                </foreach>
+        </if>
+            )
+        </if>
+        <if test="agencies != null and agencies.size() > 0">
+            <foreach collection="agencies" item="agencyId" open="AND (" close=" )" separator=" OR ">
+                AGENCY_ID = #{agencyId}
+            </foreach>
+        </if>
+        GROUP BY AGENCY_ID
+    </select>
+    <!-- 评价周期内被吹哨且被办结(无论是哪一级办结)的项目数  -->
+    <select id="selectWhistledAgencyClosedProjectCount" resultType="com.epmet.dto.extract.result.ProjectParticipatedAgencyResultDTO">
+        SELECT
+        log.AGENCY_ID,
+        COUNT(DISTINCT log.PROJECT_ID) AS count
+        FROM
+        fact_origin_project_log_daily log
+        LEFT JOIN fact_origin_project_main_daily project ON log.PROJECT_ID = project.ID AND project.DEL_FLAG = '0' AND project.CUSTOMER_ID = #{customerId}
+        WHERE log.DEL_FLAG = '0'
+        AND project.PROJECT_STATUS LIKE 'close%'
+        AND log.CUSTOMER_ID = #{customerId}
+        AND log.IS_ACTIVE = '0'
 
-                </otherwise>
-            </choose>
+        <if test='null != dimId and "" != dimId.trim()'>
+            AND log.MONTH_ID = #{dimId}
+        </if>
+        <if test="agencies != null and agencies.size() > 0">
+            <foreach collection="agencies" item="agencyId" open="AND (" close=" )" separator=" OR ">
+                log.AGENCY_ID = #{agencyId}
+            </foreach>
         </if>
+        GROUP BY log.AGENCY_ID
+    </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>
+    <!-- 查询评价周期内各级别机关办结的项目Id -->
+    <select id="selectProjectIdHandledByAgency" resultType="com.epmet.dto.extract.result.ProjectParticipatedAgencyResultDTO">
+            SELECT
+					ID AS projectId,
+					SUBSTRING_INDEX(FINISH_ORG_IDS,':',1) AS agencyId
+			FROM
+					fact_origin_project_main_daily
+			WHERE
+					DEL_FLAG = '0'
+			AND ID IN (
 
-        ORDER BY project.ID,score DESC
+					    SELECT DISTINCT PROJECT_ID FROM fact_origin_project_log_daily
+					WHERE DEL_FLAG = '0' AND CUSTOMER_ID = #{customerId}
+					AND ACTION_CODE = 'close'
+					<if test='null != dimId and "" != dimId'>
+                        AND MONTH_ID = #{dimId}
+                    </if>
+					 )
+					ORDER BY agencyId
+    </select>
+    <!-- 计算每个办结项目的总耗时 -->
+    <select id="selectProjectCostTime" resultType="com.epmet.dto.extract.result.ProjectParticipatedAgencyResultDTO">
+        SELECT
+            DISTINCT
+            log1.PROJECT_ID,
+            IF(
+                TIMESTAMPDIFF( DAY, log2.createdDate, DATE_FORMAT( log1.DATE_ID, '%Y-%m-%d' ) ) = 0,
+                1,
+                TIMESTAMPDIFF( DAY, log2.createdDate, DATE_FORMAT( log1.DATE_ID, '%Y-%m-%d' ) )
+            ) * 8 * 60 AS count
+        FROM
+            fact_origin_project_log_daily log1
+            LEFT JOIN (
+        SELECT
+            ID ,
+            DATE_FORMAT( DATE_ID, '%Y-%m-%d' ) AS createdDate
+        FROM
+            fact_origin_project_main_daily
+        WHERE
+            DEL_FLAG = '0'
+        <foreach collection="projectIds" item="projectId" open="AND ( " separator=" OR " close=" ) ">
+            ID = #{projectId}
+         </foreach>
+            AND PROJECT_STATUS = 'closed'
+
+            ) log2 ON log1.PROJECT_ID = log2.ID
+        WHERE
+            log1.DEL_FLAG = '0'
+        <foreach collection="projectIds" item="projectId" open="AND ( " separator=" OR " close=" ) ">
+            log1.PROJECT_ID = #{projectId}
+        </foreach>
+            AND log1.IS_ACTIVE = '1'
+            AND log1.ACTION_CODE = 'close'
     </select>
     <select id="selectGridResponse" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT a.ORG_ID,