From e9d56bdf839be310bd22adc01aedae5e1a87852f Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 28 十二月 2021 13:43:20 +0800
Subject: [PATCH] 12/28 项目活动相关功能修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java
index 82d3d98..a555bc3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java
@@ -61,9 +61,12 @@
+ "AND a.`status` != 1 AND a.`status` != 6 " + " </if> " + "<if test='comActActivityVO.beginAt != null '>"
+ "AND a.begin_at <![CDATA[ >= ]]> #{comActActivityVO.beginAt} AND a.end_at <![CDATA[ <= ]]> #{comActActivityVO.endAt} "
+ " </if> " + "<if test='comActActivityVO.type != null and comActActivityVO.type==1 '>"
- + "AND a.volunteer_max!=0 " + " </if> "
- + "<if test='comActActivityVO.type != null and comActActivityVO.type==2 '>" + "AND a.volunteer_max=0 "
- + " </if> " + " group by a.id " + " order by a.status asc,a.publish_at desc " + "</script>")
+ + "AND a.volunteer_max!=0 and is_project = 0 " + " </if> "
+ + "<if test='comActActivityVO.type != null and comActActivityVO.type==2 '>" + "AND a.volunteer_max=0 and is_project = 0 "
+ + " </if> "
+ + "<if test='comActActivityVO.type != null and comActActivityVO.type==4 '>" + "AND is_project = 1 "
+ + " </if> "
+ + " group by a.id " + " order by a.status asc,a.publish_at desc " + "</script>")
IPage<ComActActivityVO> pageActivity(Page page, @Param("comActActivityVO") ComActActivityVO comActActivityVO);
// @Select("SELECT " + "u.name sponsorName, " + "ca.name communityName, "
--
Gitblit v1.7.1