From 6873ee2b98283d9a876dfc6e5d878094e5de61d9 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期三, 20 一月 2021 11:30:46 +0800
Subject: [PATCH] 系统配置
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 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 f1b6adc..8f01a9b 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
@@ -54,15 +54,19 @@
"left join com_act_act_sign s on a.id=s.activity_id \n"+
" where a.community_id=#{comActActivityVO.communityId}" +
"<if test='comActActivityVO.activityName != null and comActActivityVO.activityName.trim() != ""'>" +
- " and a.activity_name = #{comActActivityVO.activityName} \n" +
+ " and a.activity_name like concat(#{comActActivityVO.activityName},'%') \n" +
" </if> " +
"<if test='comActActivityVO.status != null and comActActivityVO.status !=0'>" +
"AND a.`status` = #{comActActivityVO.status} \n" +
+ " </if> " +
+ "<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 "+
+ " order by a.publish_at desc "+
"</script>")
IPage<ComActActivityVO> pageActivity( Page page, @Param("comActActivityVO") ComActActivityVO comActActivityVO);
@@ -91,7 +95,15 @@
"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 " +
+ @Select("select " +
+ "t.activity_name," +
+ "t.id," +
+ "t.end_at," +
+ "t.begin_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" +
@@ -106,7 +118,7 @@
"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 DATEDIFF(SYSDATE(),a.sign_up_end)>=0\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();
@@ -118,12 +130,12 @@
"</script>")
int updateIdBatch(@Param("longs") List<Long> longs);
- @Update("update com_act_activity set `status`=2 where `status`=1 and DATEDIFF(SYSDATE(),publish_at)>=0")
+ @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 DATEDIFF(SYSDATE(),sign_up_begin)>=0")
+ @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 DATEDIFF(SYSDATE(),begin_at)>=0")
+ @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