From f5783e14481ee01aaf5808721d5b83ae860843b2 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 24 十月 2022 15:08:13 +0800
Subject: [PATCH] Merge branch 'local_20221024' into haucheng_panzhihua

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java
index 7c35187..c335557 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java
+++ b/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);
 
     /**
      * 分页查询党员详情活动

--
Gitblit v1.7.1