Merge branch 'hemenkou_dev' into dev

101captain

2022-02-28 bfb30e542fa76d53297d72dccca47f228987acdd

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

@@ -4,6 +4,7 @@
import java.util.List;
import java.util.Map;

import com.panzhihua.common.model.vos.community.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -291,4 +292,28 @@
     * @date 2022/2/17 10:09
     */
    String getActBelongRegionCode(@Param("communityId") Long communityId);

    /**
     * 查询党员活动数量
     * @param communityId
     * @return
     */
    PartyActivityStatics selectActivityStatics(Long communityId);

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

    /**
     * 党员活动柱状图
     * @param communityId
     * @param year
     * @param date
     * @return
     */
    Integer selectActivityLine(@Param("communityId") Long communityId,@Param("year")String year,@Param("date")String date);

}