社区相关优化 6

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

@@ -81,5 +81,5 @@ public interface FactIndexPartyAblityOrgMonthlyDao extends BaseDao<FactIndexPart
      * @author zxc
      * @date 2020/8/26 10:49 上午
      */
-    List<Map<String,Object>> selectPublishArticleCountMap(@Param("customerId")String customerId, @Param("monthId")String monthId);
+    List<Map<String,Object>> selectPublishArticleCountMap(@Param("customerId")String customerId, @Param("monthId")String monthId,@Param("level")String level);
 }

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

@@ -74,5 +74,14 @@ public interface FactIndexServiceAblityOrgMonthlyDao extends BaseDao<FactIndexSe
      * @date 2020/8/31 2:15 下午
      */
     List<CommunityActivityCountResultDTO> selectActivityCount(@Param("customerId")String customerId, @Param("monthId")String monthId);
-    List<Map<String,Object>> selectActivityCountMap(@Param("customerId")String customerId, @Param("monthId")String monthId);
+
+    /**
+     * @Description  社区活动组织次数
+     * @param customerId
+     * @param monthId
+     * @param level
+     * @author zxc
+     * @date 2020/9/2 2:09 下午
+     */
+    List<Map<String,Object>> selectActivityCountMap(@Param("customerId")String customerId, @Param("monthId")String monthId,@Param("level")String level);
 }

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

@@ -93,7 +93,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                 });
             } else {
                 // 社区名义发文数量
-                List<Map<String, Object>> mapList = factIndexPartyAblityOrgMonthlyDao.selectPublishArticleCountMap(customerId, monthId);
+                List<Map<String, Object>> mapList = factIndexPartyAblityOrgMonthlyDao.selectPublishArticleCountMap(customerId, monthId,IndexCalConstant.COMMUNITY_LEVEL);
                 if (CollectionUtils.isEmpty(mapList)) {
                     log.error("查询社区名义发文数量集合为空");
                     return;
@@ -228,9 +228,9 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                     });
                 }
             } else {
-                List<Map<String, Object>> communityActivityCountList = factIndexServiceAblityOrgMonthlyDao.selectActivityCountMap(customerId, monthId);
+                List<Map<String, Object>> communityActivityCountList = factIndexServiceAblityOrgMonthlyDao.selectActivityCountMap(customerId, monthId,IndexCalConstant.COMMUNITY_LEVEL);
                 if (CollectionUtils.isEmpty(communityActivityCountList)) {
-                    log.error("");
+                    log.error("查询社区活动组织次数集合为空");
                     return;
                 }
                 if (communityActivityCountList.size() == NumConstant.ONE) {

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

@@ -104,7 +104,7 @@
             fact_index_govrn_ablity_org_monthly
         WHERE
             del_flag = '0'
-          AND data_type = 'community'
+          AND data_type = #{level}
           AND customer_id = #{customerId}
           AND month_id = #{monthId}
     </select>

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

@@ -104,7 +104,7 @@
             fact_index_party_ablity_org_monthly
         WHERE
             del_flag = '0'
-          AND data_type = 'community'
+          AND data_type = #{level}
           AND customer_id = #{customerId}
           AND month_id = #{monthId}
     </select>

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

@@ -104,7 +104,7 @@
             fact_index_service_ablity_org_monthly
         WHERE
             del_flag = '0'
-          AND data_type = 'community'
+          AND data_type = #{level}
           AND customer_id = #{customerId}
           AND month_id = #{monthId}
     </select>