From de91c84954157bb9f8b6d938cbe0b1b51fb6e65d Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 07 五月 2021 15:23:57 +0800
Subject: [PATCH] bugfixed：新增便民服务商家 报错
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 72f3fae..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
@@ -50,12 +50,19 @@
"count(if(s.is_volunteer=0,s.id,null))participant_now,\n"+
"a.participant_max,\n" +
"a.sign_up_begin,\n" +
- "a.sign_up_end\n" +
+ "a.sign_up_end,\n" +
+ "ca.name as communityName \n" +
"FROM\n" +
"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"+
- " where a.community_id=#{comActActivityVO.communityId}" +
+ "left join com_act ca on a.community_id=ca.community_id \n"+
+ " where 1=1 " +
+
+ "<if test='comActActivityVO.choice == 0 '>" +
+ "AND a.community_id=#{comActActivityVO.communityId}\n" +
+ " </if> " +
+
"<if test='comActActivityVO.activityName != null and comActActivityVO.activityName.trim() != ""'>" +
" and a.activity_name like concat(#{comActActivityVO.activityName},'%') \n" +
" </if> " +
@@ -66,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" +
@@ -84,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" +
@@ -91,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 "
)
@@ -148,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