From 08d38fab4e81e780a5edef7ca02d66b1dc29991c Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 24 十月 2022 14:11:14 +0800
Subject: [PATCH] Merge branch 'local_20221024' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 783609a..2ff9ea9 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
@@ -1266,7 +1266,7 @@
}
}
partyActivityStatics.setPartyActivityTypeChartList(partyActivityTypeChart);
- partyActivityStatics.setPartyActivityLines(getPoints(communityId,year));
+ partyActivityStatics.setPartyActivityLines(getPoints(communityIds,year));
return R.ok(partyActivityStatics);
}
@@ -1280,7 +1280,7 @@
return R.ok(comActActivityDAO.exportPartyMemberDetail(commonPage));
}
- public List<PartyActivityLine> getPoints(Long communityId,String year){
+ public List<PartyActivityLine> getPoints(List<Long> communityIds,String year){
List<PartyActivityLine> partyActivityLines=new ArrayList<>();
for(int i=1;i<=12;i++){
String x="";
@@ -1292,7 +1292,7 @@
}
PartyActivityLine partyActivityLine=new PartyActivityLine();
partyActivityLine.setX(i+"月");
- Integer y=this.comActActivityDAO.selectActivityLine(communityId,year,x);
+ Integer y=this.comActActivityDAO.selectActivityLine(communityIds,year,x);
partyActivityLine.setY(y);
partyActivityLines.add(partyActivityLine);
}
--
Gitblit v1.7.1