Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_temp

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

@@ -90,6 +90,16 @@ public interface FactIndexPartyAblityOrgMonthlyDao extends BaseDao<FactIndexPart
     List<Map<String,Object>> selectPublishArticleCountMapExistSubStreet(@Param("monthId")String monthId,@Param("areaCode")String areaCode);
     List<Map<String,Object>> selectPublishArticleCountMapExistSubStreetNew(@Param("monthId")String monthId,@Param("areaCode")String areaCode,@Param("quarterId")String quarterId,@Param("yearId")String yearId);
     List<Map<String,Object>> selectPublishArticleCountMapExistSubNotSelf(@Param("monthId")String monthId,@Param("areaCode")String areaCode);
+
+    /**
+     * @Description  街道级发文数量
+     * @Param monthId
+     * @Param areaCode
+     * @Param quarterId
+     * @Param yearId
+     * @author zxc
+     * @date 2021/5/29 3:10 下午
+     */
     List<Map<String,Object>> selectPublishArticleCountMapExistSubNotSelfNew(@Param("monthId")String monthId,@Param("areaCode")String areaCode,@Param("quarterId")String quarterId,@Param("yearId")String yearId);
 
     /**

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

@@ -743,6 +743,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
         Map<String, String> agencyMap = agencyMap(customerId);
         detailListByParentCode.forEach(detail -> {
             if (IndexCodeEnum.SUO_YOU_JIE_DAO_ZLNLPJZ.getCode().equals(detail.getIndexCode())) {
+                // 治理能力平均值
                 List<SubAgencyScoreAvgResultDTO> districtGovernAvgList = agencyScoreDao.selectAgencyScoreAvgExistsSubNew(monthId, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),form.getCustomerAreaCode(),quarterId,yearId);
                 log.info("districtGovernAvgList:::"+districtGovernAvgList.toString());
                 for (int i = 0; i < districtGovernAvgList.size(); i++) {

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

@@ -248,26 +248,22 @@
     </select>
 
     <select id="selectAgencyScoreAvgExistsSubNew" resultType="com.epmet.dto.indexcal.SubAgencyScoreAvgResultDTO">
-        SELECT a2.pid AS parentId,a.monthId,a.quarterId,a.yearId,ROUND(AVG( a.score ),6) AS score,a.customerId,a.parentId AS agencyId FROM
-            (SELECT
-                 sca.agency_id AS agencyId,
-                 fics.month_id AS monthId,
-                 fics.quarter_id AS quarterId,
-                 fics.year_id AS yearId,
-                 IFNULL(ROUND(AVG( fics.score ),6),0) AS score,
-                 sca.customer_id AS customerId,
-                 (SELECT AGENCY_ID FROM screen_customer_agency WHERE AREA_CODE = #{areaCode} AND DEL_FLAG = 0) AS parentId
-             FROM screen_customer_agency sca
-             LEFT JOIN fact_index_agency_score fics ON
-             (fics.agency_id = sca.agency_id
-                 AND fics.del_flag = '0'
-                 AND fics.month_id = #{monthId}
-                 AND fics.index_code = #{indexCode}
-                 AND  fics.agency_id IN (SELECT AGENCY_ID FROM screen_customer_agency WHERE PARENT_AREA_CODE = #{areaCode} AND DEL_FLAG = 0)
-                 )
-             WHERE sca.DEL_FLAG = '0'
-             GROUP BY agencyId) a
-            LEFT JOIN screen_customer_agency a2 ON a2.AGENCY_ID = a.parentId AND a2.DEL_FLAG = 0
-        GROUP BY a2.AGENCY_ID
+        SELECT
+            sca.agency_id AS agencyId,
+            #{monthId} AS monthId,
+            #{quarterId} AS quarterId,
+            #{yearId} AS yearId,
+            IFNULL(ROUND(AVG( fics.score ),6),0) AS score,
+            sca.customer_id AS customerId,
+            (SELECT AGENCY_ID FROM screen_customer_agency WHERE AREA_CODE = #{areaCode} AND DEL_FLAG = 0) AS parentId
+        FROM screen_customer_agency sca
+        LEFT JOIN fact_index_agency_score fics ON
+        (fics.agency_id = sca.agency_id
+            AND fics.del_flag = '0'
+            AND fics.month_id = #{monthId}
+            AND fics.index_code = #{indexCode})
+        WHERE sca.DEL_FLAG = '0'
+          AND sca.PARENT_AREA_CODE = #{areaCode}
+        GROUP BY parentId
     </select>
 </mapper>

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

@@ -222,9 +222,9 @@
     <select id="selectGovernDeptScoreAvgExistsSubNotSelfNew" resultType="com.epmet.dto.indexcal.SubAgencyScoreAvgResultDTO">
         SELECT
             sca.agency_id,
-            fidc.month_id,
-            fidc.quarter_id,
-            fidc.year_id,
+            #{monthId} AS monthId,
+            #{quarterId} AS quarterId,
+            #{yearId} AS yearId,
             IFNULL(AVG( fidc.score ),0) AS score,
             sca.customer_id,
             sca.pid AS parentId
@@ -237,8 +237,7 @@
             AND fidc.index_code = #{indexCode}
             )
         WHERE sca.DEL_FLAG = '0'
-          AND sca.AREA_CODE LIKE CONCAT(#{areaCode},'%')
-          AND sca.AREA_CODE != #{areaCode}
+          AND sca.AREA_CODE = #{areaCode}
         GROUP BY sca.agency_id
     </select>
 </mapper>

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

@@ -211,22 +211,25 @@
           AND pm.month_id = #{monthId}
     </select>
 
+    <!-- 街道级发文数量 -->
     <select id="selectPublishArticleCountMapExistSubNotSelfNew" 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'
+            sca.AGENCY_ID,
+            sca.pid AS PARENT_ID,
+            #{monthId} AS MONTH_ID,
+            #{quarterId} AS QUARTER_ID,
+            #{yearId} AS YEAR_ID,
+            IFNULL(pm.PUBLISH_ARTICLE_COUNT,0) AS PUBLISH_ARTICLE_COUNT,
+            sca.CUSTOMER_ID
+        FROM screen_customer_agency sca
+        LEFT JOIN fact_index_party_ablity_org_monthly pm ON
+        (sca.AGENCY_ID = pm.AGENCY_ID
+            AND pm.del_flag = '0'
+            AND pm.month_id = #{monthId}
+            )
+        WHERE sca.DEL_FLAG = '0'
           AND sca.AREA_CODE = #{areaCode}
-          AND pm.month_id = #{monthId}
+
     </select>
 
     <select id="selectPublishArticleCountMapbyAreaCodeNotSelf" resultType="java.util.Map">