Merge branch 'local_20221024' into haucheng_panzhihua

yanghui

2022-10-24 f5783e14481ee01aaf5808721d5b83ae860843b2

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java

@@ -311,14 +311,14 @@
     * @param communityId
     * @return
     */
    PartyActivityStatics selectActivityStatics(Long communityId);
    PartyActivityStatics selectActivityStatics(@Param("communityIds") List<Long> communityIds);

    /**
     * 党员活动饼状图
     * @param communityId
     * @return
     */
    List<PartyActivityTypeChart> selectActivityChart(Long communityId);
    List<PartyActivityTypeChart> selectActivityChart(@Param("communityIds") List<Long> communityIds);

    /**
     * 党员活动柱状图
@@ -327,7 +327,7 @@
     * @param date
     * @return
     */
    Integer selectActivityLine(@Param("communityId") Long communityId,@Param("year")String year,@Param("date")String date);
    Integer selectActivityLine(@Param("communityIds") List<Long> communityIds,@Param("year")String year,@Param("date")String date);

    /**
     * 分页查询党员详情活动