From 29c55b8320369fee8e98cc1ae403c1aafc095485 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 15 Oct 2020 13:53:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9E=E7=BB=93=E7=8E=87=20=3D=20=E8=AF=84?=
 =?UTF-8?q?=E4=BB=B7=E5=91=A8=E6=9C=9F=E5=86=85=E5=8A=9E=E7=BB=93=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E6=95=B0/=E8=AF=84=E4=BB=B7=E5=91=A8=E6=9C=9F?=
 =?UTF-8?q?=E5=86=85=E8=A2=AB=E5=90=B9=E5=93=A8=E6=AC=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extract/FactOriginProjectLogDailyDao.java | 12 ++++++++++
 .../impl/IndexCollCommunityServiceImpl.java   |  4 ++--
 .../impl/IndexCollDistrictServiceImpl.java    |  5 +++--
 .../impl/IndexCollStreetServiceImpl.java      |  7 +++---
 .../extract/FactOriginProjectLogDailyDao.xml  | 22 ++++++++++++++++++-
 5 files changed, 42 insertions(+), 8 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 4939d2b514..180ce535bc 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
@@ -114,6 +114,18 @@ public interface FactOriginProjectLogDailyDao extends BaseDao<FactOriginProjectL
 	 * @date 2020.09.20 23:46
 	**/
 	List<ProjectParticipatedAgencyResultDTO> selectProjectParticipatedAgency(@Param("agencies") List<String> agencies, @Param("customerId") String customerId,@Param("dimId") String dimId);
+
+	/***
+	 * @Description 评价周期内被吹哨次数
+	 * @param agencies
+	 * @param customerId
+	 * @param dimId
+	 * @return java.util.List<com.epmet.dto.extract.result.ProjectParticipatedAgencyResultDTO>
+	 * @author wangc
+	 * @date 2020.10.15 11:20
+	*/
+	List<ProjectParticipatedAgencyResultDTO> selectAgencyWhistledCount(@Param("agencies") List<String> agencies, @Param("customerId") String customerId,@Param("dimId") String dimId);
+
 	/***
 	 * @Description 查询机关办结次数
 	 * @param agencies
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 dbf40fc0a1..e33f7a4982 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
@@ -137,13 +137,13 @@ 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> agencyParticipatedCount = factOriginProjectLogDailyService.getCountOfDealingAgency(agencies,customerId,dimId.getMonthId(),"month");
 		Map<String,BigDecimal> efficiencyMap = factOriginProjectLogDailyService.getAgencyWorkPieceRatio(agencies,customerId,dimId.getMonthId(),"month");
 		list.forEach(entity ->{
 			entity.setClosedProjectCount(agencyHandleCount.get(entity.getAgencyId()) == null? NumConstant.ZERO : agencyHandleCount.get(entity.getAgencyId()));
 			BigDecimal element = new BigDecimal(entity.getClosedProjectCount());
 			//分母，即机关参与过的项目数（去重）
-			Integer denominator = agencyParticipatedCount.get(entity.getAgencyId());
+			//“评价周期内被吹哨且办结的项目数”/“评价周期内被吹哨的所有项目数”
+			Integer denominator = entity.getTransferedCount();
 			if (null != denominator && denominator != NumConstant.ZERO) {
 				//办结率
 				entity.setClosedProjectRatio(
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 4337f9699b..1e576f2ba3 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
@@ -130,13 +130,14 @@ 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> agencyParticipatedCount = factOriginProjectLogDailyService.getCountOfDealingAgency(agencies,customerId,dimId.getMonthId(),"month");
+
 		Map<String,BigDecimal> efficiencyMap = factOriginProjectLogDailyService.getAgencyWorkPieceRatio(agencies,customerId,dimId.getMonthId(),"month");
 		list.forEach(entity ->{
 			entity.setClosedProjectCount(agencyHandleCount.get(entity.getAgencyId()) == null? NumConstant.ZERO : agencyHandleCount.get(entity.getAgencyId()));
 			BigDecimal element = new BigDecimal(entity.getClosedProjectCount());
 			//分母，即机关参与过的项目数（去重）
-			Integer denominator = agencyParticipatedCount.get(entity.getAgencyId());
+			//“评价周期内被吹哨且办结的项目数”/“评价周期内被吹哨的所有项目数”
+			Integer denominator = entity.getTransferedCount();
 			if (null != denominator && denominator != NumConstant.ZERO) {
 				//办结率
 				entity.setClosedProjectRatio(
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 dcf3a43dcf..edd1742ec0 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
@@ -128,15 +128,16 @@ 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> agencyParticipatedCount = factOriginProjectLogDailyService.getCountOfDealingAgency(agencies,customerId,dimId.getMonthId(),"month");
+
 		Map<String,BigDecimal> efficiencyMap = factOriginProjectLogDailyService.getAgencyWorkPieceRatio(agencies,customerId,dimId.getMonthId(),"month");
 		list.forEach(entity ->{
 			entity.setClosedProjectCount(agencyHandleCount.get(entity.getAgencyId()) == null? NumConstant.ZERO : agencyHandleCount.get(entity.getAgencyId()));
 			BigDecimal element = new BigDecimal(entity.getClosedProjectCount());
-			//分母，即机关参与过的项目数（去重）
-			Integer denominator = agencyParticipatedCount.get(entity.getAgencyId());
+			//分母，吹哨次数
+			Integer denominator = entity.getTransferedCount();
 			if (null != denominator && denominator != NumConstant.ZERO) {
 				//办结率
+				//“评价周期内被吹哨且办结的项目数”/“评价周期内被吹哨的所有项目数”
 				entity.setClosedProjectRatio(
 						element.divide(new BigDecimal(denominator), NumConstant.SIX, RoundingMode.HALF_UP)
 				);
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 9daf39ba7a..b389aa1aa3 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
@@ -160,6 +160,26 @@
         GROUP BY AGENCY_ID
     </select>
 
+    <!-- 评价周期内被吹哨次数 -->
+    <select id="selectAgencyWhistledCount" resultType="com.epmet.dto.extract.result.ProjectParticipatedAgencyResultDTO">
+        SELECT
+            AGENCY_ID,
+            COUNT(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}
+        </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="selectAgencyHandledProjectCount" resultType="com.epmet.dto.extract.result.ProjectParticipatedAgencyResultDTO">
         	SELECT
@@ -177,7 +197,7 @@
                 </if>
 
                 <if test='null != dimId and "" != dimId.trim()'>
-                    AND ((log.ID IS NOT NULL AND log.MONTH_ID  <![CDATA[>=]]>  #{dimId}) OR log.ID IS NULL )
+                    AND log.ID IS NOT NULL AND log.MONTH_ID  =  #{dimId}
                 </if>
                 GROUP BY SUBSTRING_INDEX(main.FINISH_ORG_IDS,':',1)
     </select>