From c02e4e8ebd88f2d277935111ca16f2119adbac23 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期日, 24 七月 2022 10:20:57 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 21 +++++++++++++++++++--
1 files changed, 19 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 d81d3c3..d47001b 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.common.utlis.Snowflake;
import com.panzhihua.service_community.entity.ComPbCheckUnit;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.BeanUtils;
@@ -91,7 +92,10 @@
private ComActDAO comActDAO;
@Resource
private ComPbCheckUnitDao comPbCheckUnitDao;
-
+ @Resource
+ private ComActSocialProjectDao comActSocialProjectDao;
+ @Resource
+ private ComStreetDAO comStreetDAO;
/**
* 新增社区活动
@@ -236,7 +240,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 -> {
@@ -1126,6 +1142,7 @@
@Override
public R addActivityType(ComActActivityTypeVO comActActivityTypeVO) {
try {
+ comActActivityTypeVO.setId(Snowflake.getId());
this.baseMapper.addActivityType(comActActivityTypeVO);
} catch (Exception e) {
log.error("添加活动类型错误【{}】", e.getMessage());
--
Gitblit v1.7.1