From d9eee1919dbff7ffddc48b1f4fee2ec41a54a2a2 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期二, 05 一月 2021 18:19:52 +0800
Subject: [PATCH] 运营后台完成

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 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 9d87761..817a56d 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
@@ -10,6 +10,8 @@
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.List;
+
 /**
  * @program: springcloud_k8s_panzhihuazhihuishequ
  * @description: 社区活动
@@ -55,7 +57,7 @@
             "<if test='comActActivityVO.status != null and comActActivityVO.status !=0'>" +
             "AND a.`status` = #{comActActivityVO.status} \n" +
             " </if> " +
-            "<if test='comActActivityVO.beginAt != null and comActActivityVO.beginAt.trim() != &quot;&quot;'>" +
+            "<if test='comActActivityVO.beginAt != null '>" +
             "AND a.begin_at <![CDATA[ >= ]]> #{comActActivityVO.beginAt} AND a.end_at <![CDATA[ <= ]]> #{comActActivityVO.endAt} \n" +
             " </if> " +
             " group by a.id "+
@@ -86,4 +88,8 @@
             "ORDER BY\n" +
             "s.create_at DESC")
     IPage<ComActActivityVO> pageMyActivity(Page page, @Param("comActActivityVO") ComActActivityVO comActActivityVO);
+
+    @Select("select t.activity_name,t.id,t.end_at,t.cover,t.status from com_act_act_sign s  join sys_user u on s.user_id=u.user_id and u.phone=#{phone} and s.is_volunteer=1 " +
+            "join com_act_activity t on s.activity_id=t.id and t.status=5")
+    List<ComActActivityVO> listActivityByPhone(String phone);
 }

--
Gitblit v1.7.1