From 7bfa6a85ad6a6c537b0f7ddb9f6a8795c8e8c866 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期四, 09 六月 2022 16:44:24 +0800
Subject: [PATCH] 五社&社区企业&人大代表
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 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 aac7347..34e08f5 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
@@ -17,6 +17,7 @@
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.service_community.entity.ComActSocialProject;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
@@ -88,6 +89,10 @@
private ComActActivityCodeService comActActivityCodeService;
@Resource
private ComActDAO comActDAO;
+ @Resource
+ private ComActSocialProjectDao comActSocialProjectDao;
+ @Resource
+ private ComStreetDAO comStreetDAO;
/**
* 新增社区活动
@@ -171,8 +176,24 @@
try {
WxXCXTempSend util = new WxXCXTempSend();
String accessToken = util.getAppAccessToken();
- ComActDO comActDO=comActDAO.selectById(comActActivityDO.getCommunityId());
- R<SysTemplateConfigVO> r=userService.selectTemplate(comActDO.getAreaCode(),1);
+ Integer type = comActActivityDO.getType();
+ String areaCode;
+ if (nonNull(type) && type.equals(4)) {
+ ComActSocialProject comActSocialProject = comActSocialProjectDao.selectById(comActActivityDO.getProjectId());
+ Long streetId = comActSocialProject.getStreetId();
+ Long communityId = comActSocialProject.getCommunityId();
+ if (nonNull(streetId)) {
+ ComStreetDO comStreetDO = comStreetDAO.selectById(streetId);
+ areaCode = comStreetDO.getAreaCode().toString();
+ } else {
+ ComActDO comActDO = comActDAO.selectById(communityId);
+ areaCode = comActDO.getAreaCode();
+ }
+ } else {
+ ComActDO comActDO = comActDAO.selectById(comActActivityDO.getCommunityId());
+ areaCode = comActDO.getAreaCode();
+ }
+ R<SysTemplateConfigVO> r=userService.selectTemplate(areaCode,1);
activitySignVOS.forEach(activitySignVO1 -> {
// 变更社区活动推送订阅消息给用户
WxUtil.sendSubscribeHDBG(activitySignVO1.getOpenid(), accessToken,
@@ -228,7 +249,19 @@
}
page.setSize(pageSize);
page.setCurrent(pageNum);
- IPage<ComActActivityVO> iPage = comActActivityDAO.pageActivity(page, comActActivityVO);
+ 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());
+ }
+ }
+ iPage = comActActivityDAO.pageProjectActivity(page, comActActivityVO);
+ } else {
+ iPage = comActActivityDAO.pageActivity(page, comActActivityVO);
+ }
// List<ComActActivityVO> records = iPage.getRecords();
// if (!ObjectUtils.isEmpty(records)) {
// records.forEach(comActActivityVO1 -> {
--
Gitblit v1.7.1