From 28e8b38e9de8cc76084d0af6a96d2d9d1e1f739f Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 27 十月 2022 13:28:32 +0800
Subject: [PATCH] Merge branch 'local_20221024' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 53 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 39 insertions(+), 14 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 e42da4f..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
@@ -19,6 +19,7 @@
import javax.annotation.Resource;
+import cn.hutool.core.collection.CollUtil;
import com.panzhihua.common.constants.HttpStatus;
import com.panzhihua.common.model.dtos.community.ActivityInviteDTO;
import com.panzhihua.service_community.dao.ComActNeighborCircleDAO;
@@ -306,14 +307,23 @@
}
page.setSize(pageSize);
page.setCurrent(pageNum);
+ Long communityId = comActActivityVO.getCommunityId();
+ if (null != communityId){
+ List<Long> communityIds = comActDAO.selectIds(communityId);
+ if (CollUtil.isEmpty(communityIds)) {
+ communityIds = new ArrayList<>();
+ communityIds.add(communityId);
+ }
+ comActActivityVO.setCommunityIds(communityIds);
+ }
Integer type = comActActivityVO.getType();
IPage<ComActActivityVO> iPage = null;
if (nonNull(type) && type.equals(4)) {
if (nonNull(comActActivityVO.getCommunityId())) {
- ComActDO comActDO = comActDAO.selectById(comActActivityVO.getCommunityId());
- if (nonNull(comActDO)) {
- comActActivityVO.setStreetId(comActDO.getStreetId());
- }
+ ComActDO comActDO = comActDAO.selectById(comActActivityVO.getCommunityId());
+ if (nonNull(comActDO)) {
+ comActActivityVO.setStreetId(comActDO.getStreetId());
+ }
}
iPage = comActActivityDAO.pageProjectActivity(page, comActActivityVO);
} else {
@@ -819,10 +829,8 @@
// 修改报名状态 变为报名中
// int num1 = comActActivityDAO.updateStatusToBeginSign();
// log.info("定时任务--修改社区活动报名状态活动数量【{}】", num1);
- int num3 = comActActivityDAO.updateStatusToBeginAfterSingEnd();
- log.info("定时任务--报名结束修改社区活动进行状态活动数量【{}】", num3);
// 查询已经结束的活动，需要计算积分
- List<Long> activityEndIds = comActActivityDAO.getActivityEndIds();
+ List<Long> activityEndIds = comActActivityDAO.selectBeginIds();
if(!CollectionUtils.isEmpty(activityEndIds)){
activityEndIds.forEach(activityId->{
List<String> openIds=comActActivityDAO.selectOpenIdByActivityId(activityId);
@@ -830,7 +838,7 @@
openIds.forEach(op->{
WxXCXTempSend wxXCXTempSend=new WxXCXTempSend();
try {
- WxUtil.sendLongTimeTemplate(op,wxXCXTempSend.getAccessToken(),"活动开始提醒","您参加的活动已开始","packageC/pages/activity/communityActivityDetails/communityActivityDetails?id="+activityId);
+ WxUtil.sendLongTimeTemplate(op,wxXCXTempSend.getAccessToken("wx118de8a734d269f0"),"活动开始提醒","您参加的活动已开始","packageC/pages/activity/communityActivityDetails/communityActivityDetails?id="+activityId);
} catch (Exception e) {
e.printStackTrace();
}
@@ -838,6 +846,8 @@
}
});
}
+ int num3 = comActActivityDAO.updateStatusToBeginAfterSingEnd();
+ log.info("定时任务--报名结束修改社区活动进行状态活动数量【{}】", num3);
// 修改进行状态 变为进行中或者已结束
List<Long> ids = comActActivityDAO.getActivityEndIds();
if(!CollectionUtils.isEmpty(ids)){
@@ -849,7 +859,7 @@
openIds.forEach(op->{
WxXCXTempSend wxXCXTempSend=new WxXCXTempSend();
try {
- WxUtil.sendLongTimeTemplate(op,wxXCXTempSend.getAccessToken(),"活动结束提醒","您参加的活动已结束","packageC/pages/activity/communityActivityDetails/communityActivityDetails?id="+id);
+ WxUtil.sendLongTimeTemplate(op,wxXCXTempSend.getAccessToken("wx118de8a734d269f0"),"活动结束提醒","您参加的活动已结束","packageC/pages/activity/communityActivityDetails/communityActivityDetails?id="+id);
} catch (Exception e) {
e.printStackTrace();
}
@@ -882,6 +892,15 @@
}
page.setSize(pageSize);
page.setCurrent(pageNum);
+ Long communityId = comActActivityVO.getCommunityId();
+ if (null != communityId){
+ List<Long> communityIds = comActDAO.selectIds(communityId);
+ if (CollUtil.isEmpty(communityIds)) {
+ communityIds = new ArrayList<>();
+ communityIds.add(communityId);
+ }
+ comActActivityVO.setCommunityIds(communityIds);
+ }
IPage<ComActActivityVO> iPage = comActActivityDAO.pageActivityCommunityBack(page, comActActivityVO);
iPage.getRecords().forEach(vo ->{
List<ComActActEvaluateDO> comActActEvaluateDOList = comActActEvaluateDAO
@@ -1231,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 -> {
@@ -1241,7 +1266,7 @@
}
}
partyActivityStatics.setPartyActivityTypeChartList(partyActivityTypeChart);
- partyActivityStatics.setPartyActivityLines(getPoints(communityId,year));
+ partyActivityStatics.setPartyActivityLines(getPoints(communityIds,year));
return R.ok(partyActivityStatics);
}
@@ -1255,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="";
@@ -1267,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