From ada9d2e3f734582a0d9ae8c00a936d8c8ed669d7 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期五, 15 一月 2021 13:51:44 +0800
Subject: [PATCH] 微心愿详情bug
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java | 45 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 44 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..bd91cbc 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
@@ -9,6 +9,9 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.List;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -37,6 +40,7 @@
"a.`status`,\n" +
"a.publish_at,\n" +
"a.begin_at,\n" +
+ "a.cover,\n" +
"a.end_at,\n" +
"a.volunteer_max,\n" +
"count(if(s.is_volunteer=1,s.id,null))volunteer_now,\n"+
@@ -55,7 +59,10 @@
"<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() != ""'>" +
+ "<if test='comActActivityVO.isApplets != null and comActActivityVO.isApplets ==1'>" +
+ "AND a.`status` != 1 \n" +
+ " </if> " +
+ "<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 +93,40 @@
"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);
+ @Select("select t.id from (\n" +
+ "SELECT \n" +
+ "a.id,\n" +
+ "a.activity_name,\n" +
+ "COUNT(case when s.is_volunteer=1 then s.id else null end )volunteernum,\n" +
+ "COUNT(case when s.is_volunteer=0 then s.id else null end)usernum,\n" +
+ "a.participant_min,\n" +
+ "a.volunteer_min\n" +
+ "FROM\n" +
+ "com_act_activity a \n" +
+ "LEFT JOIN com_act_act_sign s on a.id=s.activity_id \n" +
+ "WHERE\n" +
+ "a.`status` in(3,4) and TIMESTAMPDIFF(HOUR,SYSDATE(),a.sign_up_end)<=0\n" +
+ "GROUP BY a.id)t WHERE t.usernum<participant_min or t.volunteernum<volunteer_min")
+ List<Long> selectTimedTaskActActivity();
+
+ @Update("<script> " +
+ "update com_act_activity set `status`=6 where id in\n" +
+ "<foreach item=\"item\" collection=\"longs\" separator=\",\" open=\"(\" close=\")\" index=\"\">\n"+
+ "#{item}\n"+
+ "</foreach>\n"+
+ "</script>")
+ int updateIdBatch(@Param("longs") List<Long> longs);
+
+ @Update("update com_act_activity set `status`=2 where `status`=1 and TIMESTAMPDIFF(HOUR,SYSDATE(),publish_at)<=0")
+ int updateStatusToNotBegin();
+
+ @Update("update com_act_activity set `status`=3 where `status`=2 and TIMESTAMPDIFF(HOUR,SYSDATE(),sign_up_begin)<=0")
+ int updateStatusToBeginSign();
+
+ @Update("update com_act_activity set `status`=(if(DATEDIFF(SYSDATE(),end_at)>=0,5,4)) where `status`=3 and TIMESTAMPDIFF(HOUR,SYSDATE(),begin_at)<=0")
+ int updateStatusToBeginActiveOrEnd();
}
--
Gitblit v1.7.1