From 8788a78ad30c1bb9d50d91b10e76d3ae47ed8da2 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 07 六月 2021 09:28:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 3f73767..cff554a 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
@@ -73,7 +73,7 @@
"AND a.`status` in (3,4) \n" +
" </if> " +
"<if test='comActActivityVO.isApplets != null and comActActivityVO.isApplets ==1'>" +
- "AND a.`status` != 1 \n" +
+ "AND a.`status` != 1 AND a.`status` != 6 \n" +
" </if> " +
"<if test='comActActivityVO.beginAt != null '>" +
"AND a.begin_at <![CDATA[ >= ]]> #{comActActivityVO.beginAt} AND a.end_at <![CDATA[ <= ]]> #{comActActivityVO.endAt} \n" +
@@ -91,6 +91,7 @@
@Select("SELECT \n" +
"u.name sponsorName,\n" +
+ "ca.name communityName,\n" +
"count(if(s.is_volunteer=1,s.id,null))volunteer_now,\n"+
"count(if(s.is_volunteer=0,s.id,null))participant_now,\n"+
"a.* \n" +
@@ -98,6 +99,7 @@
"com_act_activity a \n" +
"join sys_user u on a.sponsor_id=u.user_id \n"+
"left join com_act_act_sign s on a.id=s.activity_id \n"+
+ "left join com_act ca on a.community_id=ca.community_id \n"+
"where a.id=#{id} \n"+
" group by a.id "
)
@@ -155,7 +157,7 @@
@Update("update com_act_activity set `status`=3 where `status`=2 and TIMESTAMPDIFF(MINUTE,SYSDATE(),sign_up_begin)<=0")
int updateStatusToBeginSign();
- @Update("update com_act_activity set `status`=(if(DATEDIFF(SYSDATE(),end_at)>=0,5,4)) where `status` in (3,4) and TIMESTAMPDIFF(MINUTE,SYSDATE(),sign_up_end)<=0")
+ @Update("update com_act_activity set `status`=5 where `status` in (3,4) and TIMESTAMPDIFF(MINUTE,SYSDATE(),sign_up_end)<=0")
int updateStatusToBeginActiveOrEnd();
@Select("<script> " +
"select t.* from (\n" +
--
Gitblit v1.7.1