From 9bab267e8be49ade8df6ec3d6d3f96b03321e429 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 01 三月 2022 14:07:29 +0800
Subject: [PATCH] 三社功能,抽奖功能修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java | 4 ++--
1 files changed, 2 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 967a351..d862e3a 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
@@ -41,7 +41,7 @@
+ "a.`status`, " + "a.is_qr_code, " + "a.publish_at, " + "a.begin_at, " + "a.cover, " + "a.end_at, " + "a.volunteer_max, "
+ "count(if(s.is_volunteer=1,s.id,null))volunteer_now, "
+ "count(if(s.is_volunteer=0,s.id,null))participant_now, " + "a.participant_max, " + "a.sign_up_begin, "
- + "a.sign_up_end, " + "ca.name as communityName " + "FROM " + "com_act_activity a "
+ + "a.sign_up_end, " + "ca.name as communityName,a.type " + "FROM " + "com_act_activity a "
+ "left join sys_user u on a.sponsor_id=u.user_id " + "left join (select * from com_act_act_sign where `status` = 1) s on a.id=s.activity_id "
+ "left join com_act ca on a.community_id=ca.community_id " + " where 1=1 " +
@@ -59,7 +59,7 @@
+ "AND a.begin_at <![CDATA[ >= ]]> #{comActActivityVO.beginAt} AND a.end_at <![CDATA[ <= ]]> #{comActActivityVO.endAt} "
+ " </if> " + "<if test='comActActivityVO.type != null'>"
+ "AND a.type=#{comActActivityVO.type} " + " </if> "
- + " group by a.id " + " order by a.status asc,a.publish_at desc " + "</script>")
+ + " group by a.id " + " ORDER BY a.status = 99 desc,a.publish_at DESC " + "</script>")
IPage<ComActActivityVO> pageActivity(Page page, @Param("comActActivityVO") ComActActivityVO comActActivityVO);
// @Select("SELECT " + "u.name sponsorName, " + "ca.name communityName, "
--
Gitblit v1.7.1