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/indexcal/GridScoreDao.java

@@ -88,6 +88,17 @@ public interface GridScoreDao extends BaseDao<GridScoreEntity> {
      * @date 2021/1/15 上午9:24
      */
     List<SubGridAvgResultDTO> selectSubGridAvgScoreByAreaCode(@Param("monthId")String monthId, @Param("indexCode")String indexCode, @Param("areaCode")String areaCode);
+
+    /**
+     * @Description  【社区-community】三能能力平均值
+     * @Param monthId
+     * @Param indexCode
+     * @Param areaCode
+     * @Param quarterId
+     * @Param yearId
+     * @author zxc
+     * @date 2021/5/31 9:19 上午
+     */
     List<SubGridAvgResultDTO> selectSubGridAvgScoreByAreaCodeNew(@Param("monthId")String monthId, @Param("indexCode")String indexCode, @Param("areaCode")String areaCode,@Param("quarterId")String quarterId,@Param("yearId")String yearId);
 
     /**

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

@@ -112,6 +112,16 @@ public interface FactIndexPartyAblityOrgMonthlyDao extends BaseDao<FactIndexPart
      */
     List<Map<String,Object>> selectPublishArticleCountMapbyAreaCode(@Param("monthId")String monthId,@Param("areaCode")String areaCode);
     List<Map<String,Object>> selectPublishArticleCountMapbyAreaCodeNotSelf(@Param("monthId")String monthId,@Param("areaCode")String areaCode);
+
+    /**
+     * @Description  【社区-community】发文数量
+     * @Param monthId
+     * @Param areaCode
+     * @Param quarterId
+     * @Param yearId
+     * @author zxc
+     * @date 2021/5/31 9:19 上午
+     */
     List<Map<String,Object>> selectPublishArticleCountMapbyAreaCodeNotSelfNew(@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/dao/evaluationindex/indexcoll/FactIndexServiceAblityOrgMonthlyDao.java

@@ -114,6 +114,16 @@ public interface FactIndexServiceAblityOrgMonthlyDao extends BaseDao<FactIndexSe
      */
     List<Map<String,Object>> selectActivityCountMapIsKongCunNew(@Param("monthId")String monthId,@Param("areaCode")String areaCode,@Param("quarterId")String quarterId,@Param("yearId")String yearId,@Param("customerId")String customerId);
     List<Map<String,Object>> selectActivityCountMapExistsSubNotSelf(@Param("monthId")String monthId,@Param("areaCode")String areaCode);
+
+    /**
+     * @Description  【社区-community】活动组织次数
+     * @Param monthId
+     * @Param areaCode
+     * @Param quarterId
+     * @Param yearId
+     * @author zxc
+     * @date 2021/5/31 9:21 上午
+     */
     List<Map<String,Object>> selectActivityCountMapExistsSubNotSelfNew(@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/IndexCalculateCommunityServiceImpl.java

@@ -822,6 +822,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                     });
                 }
             } else {
+                // 活动组织次数
                 List<Map<String, Object>> communityActivityCountList = factIndexServiceAblityOrgMonthlyDao.selectActivityCountMapExistsSubNotSelfNew(form.getMonthId(),form.getCustomerAreaCode(),quarterId,yearId);
                 if (CollectionUtils.isEmpty(communityActivityCountList)) {
                     log.warn(IndexCalConstant.COMMUNITY_SERVICE_ABILITY_NULL);

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

@@ -243,7 +243,7 @@
             )
         WHERE sca.DEL_FLAG = 0
           AND sca.AREA_CODE LIKE CONCAT(#{areaCode},'%')
-          AND sca.AREA_CODE != #{areaCode}
+          AND sca.`LEVEL` = 'community'
         GROUP BY sca.agency_id
     </select>
 

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

@@ -270,7 +270,6 @@
             )
         WHERE sca.DEL_FLAG = '0'
           AND sca.AREA_CODE LIKE CONCAT(#{areaCode},'%')
-          AND sca.AREA_CODE != #{areaCode}
           AND sca.`LEVEL` = 'community'
           AND sca.UP_TO_CAL = 'yes'
     </select>

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

@@ -259,6 +259,6 @@
                 )
         WHERE sca.DEL_FLAG = '0'
           AND sca.AREA_CODE LIKE CONCAT(#{areaCode},'%')
-          AND sca.AREA_CODE != #{areaCode}
+          AND sca.`LEVEL` = 'community'
     </select>
 </mapper>