网格办结项目数修改

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java

@@ -72,13 +72,13 @@ public interface FactOriginProjectMainDailyDao extends BaseDao<FactOriginProject
 
 	/**
 	 * @Description  网格办结项目数
-	 * @param customerId
+	 * @param gridIds
 	 * @param monthId
 	 * @param status
 	 * @author zxc
 	 * @date 2020/9/18 2:06 下午
 	 */
-	List<GridProjectClosedTotalResultDTO> selectGridClosedProject(@Param("customerId") String customerId,@Param("monthId") String monthId,@Param("status") String status);
+	List<GridProjectClosedTotalResultDTO> selectGridClosedProject(@Param("gridIds") List<String> gridIds,@Param("monthId") String monthId,@Param("status") String status);
 
 	List<TransferRightRatioResultDTO> selectTransferRightRatio(@Param("customerId")String customerId, @Param("monthId")String monthId);
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalGridIndexServiceImpl.java

@@ -258,7 +258,7 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
             });
         }
         //网格办结项目数
-        List<GridProjectClosedTotalResultDTO> gridProjectClosedTotalList = projectMainService.selectGridClosedProject(customerId, monthId, ExtractConstant.CLOSED);
+        List<GridProjectClosedTotalResultDTO> gridProjectClosedTotalList = projectMainService.selectGridClosedProject(result.stream().map(m -> m.getGridId()).collect(Collectors.toList()), monthId, ExtractConstant.CLOSED);
         //网格吹哨部门准确率  【没被退回的项目数/项目总数 】
         List<TransferRightRatioResultDTO> transferRightRatioResultDTOS = projectMainService.selectTransferRightRatio(customerId, monthId);
         List<TransferRightRatioResultDTO> transferRightRatioResultDTOS1 = projectLogService.selectNotReturn(customerId, monthId);

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java

@@ -121,13 +121,13 @@ public interface FactOriginProjectMainDailyService extends BaseService<FactOrigi
 
     /**
      * @Description  网格办结项目数
-     * @param customerId
+     * @param gridIds
      * @param monthId
      * @param status
      * @author zxc
      * @date 2020/9/18 2:06 下午
      */
-    List<GridProjectClosedTotalResultDTO> selectGridClosedProject(String customerId,String monthId,String status);
+    List<GridProjectClosedTotalResultDTO> selectGridClosedProject(List<String> gridIds,String monthId,String status);
 
     List<TransferRightRatioResultDTO> selectTransferRightRatio(String customerId,String monthId);
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java

@@ -135,15 +135,18 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl<FactO
 
     /**
      * @Description  网格办结项目数
-     * @param customerId
+     * @param gridIds
      * @param monthId
      * @param status
      * @author zxc
      * @date 2020/9/18 2:06 下午
      */
     @Override
-    public List<GridProjectClosedTotalResultDTO> selectGridClosedProject(String customerId, String monthId, String status) {
-        return baseDao.selectGridClosedProject(customerId, monthId,status);
+    public List<GridProjectClosedTotalResultDTO> selectGridClosedProject(List<String> gridIds, String monthId, String status) {
+        if (CollectionUtils.isEmpty(gridIds)){
+            return new ArrayList<>();
+        }
+        return baseDao.selectGridClosedProject(gridIds, monthId,status);
     }
 
     @Override

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

@@ -92,16 +92,20 @@
     <select id="selectGridClosedProject" resultType="com.epmet.dto.extract.result.GridProjectClosedTotalResultDTO">
         SELECT
             COUNT(ID) AS resolveProjectCount,
-            GRID_ID
+            SUBSTRING_INDEX(FINISH_ORG_IDS,':',-1) AS gridId
         FROM
             fact_origin_project_main_daily
         WHERE
             DEL_FLAG = 0
             AND GRID_ID != ''
-            AND PROJECT_STATUS = #{status}
-            AND CUSTOMER_ID = #{customerId}
-            AND MONTH_ID = #{monthId}
-            GROUP BY GRID_ID
+          AND PROJECT_STATUS = #{status}
+          AND MONTH_ID = #{monthId}
+          AND (
+            <foreach collection="gridIds" item="gridId" separator=" OR ">
+                FINISH_ORG_IDS LIKE concat('%',#{gridId})
+            </foreach>
+            )
+        GROUP BY GRID_ID
     </select>
     <delete id="deleteByDate">
         DELETE FROM