指数计算 street修改

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/CommunityScoreDao.java

@@ -97,6 +97,7 @@ public interface CommunityScoreDao extends BaseDao<FactIndexCommunityScoreEntity
      * @date 2021/1/15 下午3:19
      */
     List<SubCommunityAvgResultDTO> selectSubCommAvgScoreExistSub(@Param("monthId")String monthId, @Param("indexCode")String indexCode,@Param("areaCode")String areaCode);
+    List<SubCommunityAvgResultDTO> selectSubCommAvgScoreExistSubNotSelf(@Param("monthId")String monthId, @Param("indexCode")String indexCode,@Param("areaCode")String areaCode);
 
     /**
      * 根据入参查询  查询社区id

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyDao.java

@@ -75,6 +75,7 @@ public interface FactIndexGovrnAblityOrgMonthlyDao extends BaseDao<FactIndexGovr
      * @date 2021/1/15 下午1:27
      */
     List<Map<String,Object>> selectCommunityGovernAbilityExistsSub(@Param("monthId")String monthId,@Param("areaCode")String areaCode);
+    List<Map<String,Object>> selectCommunityGovernAbilityExistsSubNotSelf(@Param("monthId")String monthId,@Param("areaCode")String areaCode);
 
     /**
      * 根据组织类型删除数据

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/FactIndexPartyAblityOrgMonthlyDao.java

@@ -86,6 +86,7 @@ public interface FactIndexPartyAblityOrgMonthlyDao extends BaseDao<FactIndexPart
      * @date 2021/1/15 下午3:31
      */
     List<Map<String,Object>> selectPublishArticleCountMapExistSub(@Param("monthId")String monthId,@Param("areaCode")String areaCode,@Param("areaCodeLength")Integer areaCodeLength);
+    List<Map<String,Object>> selectPublishArticleCountMapExistSubNotSelf(@Param("monthId")String monthId,@Param("areaCode")String areaCode,@Param("areaCodeLength")Integer areaCodeLength);
 
     /**
      * @Description  查询社区下的发文数 Map【根据areaCode】

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/FactIndexServiceAblityOrgMonthlyDao.java

@@ -87,6 +87,7 @@ public interface FactIndexServiceAblityOrgMonthlyDao extends BaseDao<FactIndexSe
      * @date 2021/1/15 下午1:53
      */
     List<Map<String,Object>> selectActivityCountMapExistsSub(@Param("monthId")String monthId,@Param("areaCode")String areaCode);
+    List<Map<String,Object>> selectActivityCountMapExistsSubNotSelf(@Param("monthId")String monthId,@Param("areaCode")String areaCode);
 
     /**
      * 根据组织类型删除数据

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java

@@ -613,7 +613,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
         //下属所有社区的党建能力平均值
         detailListByParentCode.forEach(detail -> {
             if (IndexCodeEnum.JIE_DAO_XIA_SHU_SYSQDJNLHZPJZ.getCode().equals(detail.getIndexCode())) {
-                List<SubCommunityAvgResultDTO> subCommPartyAvgScore = communityScoreDao.selectSubCommAvgScoreExistSub(monthId,IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(),form.getCustomerAreaCode());
+                List<SubCommunityAvgResultDTO> subCommPartyAvgScore = communityScoreDao.selectSubCommAvgScoreExistSubNotSelf(monthId,IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(),form.getCustomerAreaCode());
                 if (CollectionUtils.isEmpty(subCommPartyAvgScore)) {
                     log.warn(IndexCalConstant.COMMUNITY_PARTY_AVG_NULL);
                 } else if (subCommPartyAvgScore.size() > NumConstant.ZERO) {
@@ -634,7 +634,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                 }
             } else {
                 // 街道名义发文数量
-                List<Map<String, Object>> mapList = factIndexPartyAblityOrgMonthlyDao.selectPublishArticleCountMapExistSub(monthId,form.getCustomerAreaCode(),NumConstant.NINE);
+                List<Map<String, Object>> mapList = factIndexPartyAblityOrgMonthlyDao.selectPublishArticleCountMapExistSubNotSelf(monthId,form.getCustomerAreaCode(),NumConstant.NINE);
                 if (CollectionUtils.isEmpty(mapList)) {
                     log.warn(IndexCalConstant.STREET_PUBLISH_ARTICLE_LIST_NULL);
                 } else {
@@ -688,7 +688,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
         Map<String, String> pid = new HashMap<>();
         detailListByParentCode.forEach(detail -> {
             if (IndexCodeEnum.JIE_DAO_XIA_SHU_SYSQZLNLHZ.getCode().equals(detail.getIndexCode())) {
-                List<SubCommunityAvgResultDTO> subGridGovernAvg = communityScoreDao.selectSubCommAvgScoreExistSub(monthId,IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),form.getCustomerAreaCode());
+                List<SubCommunityAvgResultDTO> subGridGovernAvg = communityScoreDao.selectSubCommAvgScoreExistSubNotSelf(monthId,IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),form.getCustomerAreaCode());
                 if (CollectionUtils.isEmpty(subGridGovernAvg)){
                     log.warn("查询街道下属所有社区治理能力汇总为空");
                 }else if (subGridGovernAvg.size() > NumConstant.ZERO) {
@@ -708,7 +708,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                 }
             } else {
                 // 治理能力的六个五级指标
-                List<Map<String, Object>> communityGovernAbility = factIndexGovrnAblityOrgMonthlyDao.selectCommunityGovernAbilityExistsSub(monthId,form.getCustomerAreaCode());
+                List<Map<String, Object>> communityGovernAbility = factIndexGovrnAblityOrgMonthlyDao.selectCommunityGovernAbilityExistsSubNotSelf(monthId,form.getCustomerAreaCode());
                 if (CollectionUtils.isEmpty(communityGovernAbility)){
                     log.warn(IndexCalConstant.STREET_GOVERN_ABILITY_NULL);
                 }else{
@@ -762,7 +762,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
         detailListByParentCode.forEach(detail -> {
             String indexCode = detail.getIndexCode();
             if (IndexCodeEnum.JIE_DAO_XIA_SHU_SQFWNLDFPYZ.getCode().equals(indexCode)) {
-                List<SubCommunityAvgResultDTO> subCommServiceAvg = communityScoreDao.selectSubCommAvgScoreExistSub(monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode(),form.getCustomerAreaCode());
+                List<SubCommunityAvgResultDTO> subCommServiceAvg = communityScoreDao.selectSubCommAvgScoreExistSubNotSelf(monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode(),form.getCustomerAreaCode());
                 if (CollectionUtils.isEmpty(subCommServiceAvg)) {
                     log.warn("查询街道下属社区服务能力得分平均值为空");
                 } else if (subCommServiceAvg.size() > NumConstant.ZERO) {
@@ -781,7 +781,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                     });
                 }
             } else {
-                List<Map<String, Object>> communityActivityCountList = factIndexServiceAblityOrgMonthlyDao.selectActivityCountMapExistsSub(monthId,form.getCustomerAreaCode());
+                List<Map<String, Object>> communityActivityCountList = factIndexServiceAblityOrgMonthlyDao.selectActivityCountMapExistsSubNotSelf(monthId,form.getCustomerAreaCode());
                 if (CollectionUtils.isEmpty(communityActivityCountList)) {
                     log.warn(IndexCalConstant.STREET_SERVICE_ABILITY_NULL);
                 }else{

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunityScoreDao.xml

@@ -168,4 +168,25 @@
           AND fics.index_code = #{indexCode}
         GROUP BY fics.parent_agency_id
     </select>
+    <select id="selectSubCommAvgScoreExistSubNotSelf" resultType="com.epmet.dto.indexcal.SubCommunityAvgResultDTO">
+        SELECT
+            fics.PARENT_AGENCY_ID AS agencyId,
+            fics.month_id,
+            fics.quarter_id,
+            fics.year_id,
+            ROUND(AVG( fics.score ),6) AS score,
+            fics.customer_id,
+            sca.pid AS parentId
+        FROM
+            fact_index_community_score fics
+            LEFT JOIN screen_customer_agency sca ON sca.AGENCY_ID = fics.PARENT_AGENCY_ID
+        WHERE
+            fics.del_flag = '0'
+          AND sca.DEL_FLAG = 0
+          AND sca.AREA_CODE LIKE CONCAT(#{areaCode},'%')
+          AND sca.AREA_CODE != #{areaCode}
+          AND fics.month_id = #{monthId}
+          AND fics.index_code = #{indexCode}
+        GROUP BY fics.parent_agency_id
+    </select>
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyDao.xml

@@ -173,4 +173,27 @@
           AND gm.month_id = #{monthId}
           AND sca.AREA_CODE LIKE CONCAT(#{areaCode},'%')
     </select>
+    <select id="selectCommunityGovernAbilityExistsSubNotSelf" resultType="java.util.Map">
+        SELECT
+            gm.AGENCY_ID,
+            gm.PARENT_ID,
+            gm.MONTH_ID,
+            gm.QUARTER_ID,
+            gm.YEAR_ID,
+            gm.TRANSFERED_COUNT,
+            gm.CLOSED_PROJECT_COUNT,
+            gm.RESP_PROJECT_RATIO,
+            gm.OVERDUE_PROJECT_RATIO,
+            gm.CLOSED_PROJECT_RATIO,
+            gm.SATISFACTION_RATIO,
+            gm.HANDLE_PROJECT_RATIO
+        FROM
+            fact_index_govrn_ablity_org_monthly gm
+            LEFT JOIN screen_customer_agency sca ON sca.AGENCY_ID = gm.AGENCY_ID
+        WHERE
+            gm.del_flag = '0'
+          AND gm.month_id = #{monthId}
+          AND sca.AREA_CODE LIKE CONCAT(#{areaCode},'%')
+          AND sca.AREA_CODE != #{areaCode}
+    </select>
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexPartyAblityOrgMonthlyDao.xml

@@ -149,5 +149,23 @@
           AND sca.AREA_CODE LIKE CONCAT(#{areaCode},'%')
           AND pm.month_id = #{monthId}
     </select>
+    <select id="selectPublishArticleCountMapExistSubNotSelf" resultType="java.util.Map">
+        SELECT
+            pm.AGENCY_ID,
+            pm.PARENT_ID,
+            pm.MONTH_ID,
+            pm.QUARTER_ID,
+            pm.YEAR_ID,
+            pm.PUBLISH_ARTICLE_COUNT,
+            pm.CUSTOMER_ID
+        FROM
+            fact_index_party_ablity_org_monthly pm
+            LEFT JOIN screen_customer_agency sca ON sca.AGENCY_ID = pm.AGENCY_ID
+        WHERE
+            pm.del_flag = '0'
+          AND sca.AREA_CODE LIKE CONCAT(#{areaCode},'%')
+          AND sca.AREA_CODE != #{areaCode}
+          AND pm.month_id = #{monthId}
+    </select>
 
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexServiceAblityOrgMonthlyDao.xml

@@ -130,4 +130,22 @@
           AND sca.AREA_CODE LIKE CONCAT(#{areaCode},'%')
           AND sm.month_id = #{monthId}
     </select>
+    <select id="selectActivityCountMapExistsSubNotSelf" resultType="java.util.Map">
+        SELECT
+            sm.AGENCY_ID,
+            sm.PARENT_ID,
+            sm.MONTH_ID,
+            sm.QUARTER_ID,
+            sm.YEAR_ID,
+            sm.ACTIVITY_COUNT,
+            sm.CUSTOMER_ID
+        FROM
+            fact_index_service_ablity_org_monthly sm
+            LEFT JOIN screen_customer_agency sca ON sca.AGENCY_ID = sm.AGENCY_ID
+        WHERE
+            sm.del_flag = '0'
+          AND sca.AREA_CODE LIKE CONCAT(#{areaCode},'%')
+          AND sca.AREA_CODE != #{areaCode}
+          AND sm.month_id = #{monthId}
+    </select>
 </mapper>