From d50ef0ec94f90ddf92bcd42671aa62ae38df81b9 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 20 七月 2022 15:36:06 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 18 +++++++++++++++---
1 files changed, 15 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 90db5f7..1cd9169 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.ComPbCheckUnit;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
@@ -88,6 +89,9 @@
private ComActActivityCodeService comActActivityCodeService;
@Resource
private ComActDAO comActDAO;
+ @Resource
+ private ComPbCheckUnitDao comPbCheckUnitDao;
+
/**
* 新增社区活动
@@ -121,6 +125,10 @@
if(comActActivityVO.getType()==4){
comActActivityDO.setIsProject(1);
}
+ if(comActActivityVO.getType()==5){
+ comPbCheckUnitDao.selectOne(new QueryWrapper<ComPbCheckUnit>().lambda().eq(ComPbCheckUnit::getAdminPhone,comActActivityVO.getPhone()).last("limit 1"));
+ }
+
boolean save = this.save(comActActivityDO);
if (!save) {
return R.fail();
@@ -310,7 +318,7 @@
List<ComActActRegistDO> collect = regList.stream().sorted(Comparator.comparing(ComActActRegistDO::getId).reversed()).collect(Collectors.toList());
comActActivityVO.setTimes(collect.get(0).getTimes());
ComActActRegistDO comActActRegistDO=collect.get(0);
- if(comActActRegistDO.getType()==3){
+ if(comActActRegistDO.getType()==3||comActActRegistDO.getType()==5){
if(comActActRegistDO.getEndTime()==null){
comActActivityVO.setSignType(2);
}
@@ -337,10 +345,14 @@
*/
@Override
public R listActivitySign(ActivitySignVO activitySignVO) {
-
+ ComActActivityDO comActActivityDO=comActActivityDAO.selectById(activitySignVO.getActivityId());
+ if(comActActivityDO!=null&&comActActivityDO.getType()==5){
+ IPage<ActivitySignVO> activitySignVOS = comActActSignDAO
+ .listActivitySignParty(new Page(activitySignVO.getPageNum(), activitySignVO.getPageSize()), activitySignVO);
+ return R.ok(activitySignVOS);
+ }
IPage<ActivitySignVO> activitySignVOS = comActActSignDAO
.listActivitySign(new Page(activitySignVO.getPageNum(), activitySignVO.getPageSize()), activitySignVO);
- // List<ActivitySignVO> activitySignVOS = comActActSignDAO.listActivitySign(activitySignVO);
return R.ok(activitySignVOS);
}
--
Gitblit v1.7.1