From beaebbce2afeab6931c2908a65a794e53cc51c4b Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 01 八月 2022 11:23:36 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 12 +++++++++---
1 files changed, 9 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 2a5a0df..38ddad6 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
@@ -318,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);
}
@@ -345,10 +345,16 @@
*/
@Override
public R listActivitySign(ActivitySignVO activitySignVO) {
-
+ ComActActivityDO comActActivityDO=comActActivityDAO.selectById(activitySignVO.getActivityId());
+ if(comActActivityDO!=null){
+ if(comActActivityDO.getType()==3||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