From 6261ccbbd8b4d7100cfa7abe7e36bb2a14408cf8 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 24 十月 2022 14:02:12 +0800
Subject: [PATCH] #feat 修改参加活动统计
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
index 7684a72..783609a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -1250,8 +1250,14 @@
@Override
public R partyMemberCount(Long communityId, String year) {
- PartyActivityStatics partyActivityStatics=this.comActActivityDAO.selectActivityStatics(communityId);
- List<PartyActivityTypeChart> partyActivityTypeChart=this.comActActivityDAO.selectActivityChart(communityId);
+
+ List<Long> communityIds = comActDAO.selectIds(communityId);
+ if (CollUtil.isEmpty(communityIds)){
+ communityIds = new ArrayList<>();
+ communityIds.add(communityId);
+ }
+ PartyActivityStatics partyActivityStatics=this.comActActivityDAO.selectActivityStatics(communityIds);
+ List<PartyActivityTypeChart> partyActivityTypeChart=this.comActActivityDAO.selectActivityChart(communityIds);
if(partyActivityStatics.getActivityCount()!=null&&partyActivityStatics.getActivityCount()>0){
if(!CollectionUtils.isEmpty(partyActivityTypeChart)){
partyActivityTypeChart.forEach(partyActivityTypeChart1 -> {
--
Gitblit v1.7.1