From f8b116ce4c5edea7e33c31347d2065ce33fa5f53 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期五, 22 十月 2021 09:41:10 +0800
Subject: [PATCH] 活动积分优化相关代码提交
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 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 9da35b2..f3ab2fb 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
@@ -5,6 +5,7 @@
import java.util.Map;
import com.panzhihua.common.model.vos.community.ComActActivityStatisticsVO;
+import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -61,16 +62,22 @@
+ "AND a.begin_at <![CDATA[ >= ]]> #{comActActivityVO.beginAt} AND a.end_at <![CDATA[ <= ]]> #{comActActivityVO.endAt} "
+ " </if> " + "<if test='comActActivityVO.type != null and comActActivityVO.type==1 '>"
+ "AND a.volunteer_max!=0 " + " </if> "
- + "<if test='comActActivityVO.type != null and comActActivityVO.type==2 '>" + "AND a.participant_max!=0 "
+ + "<if test='comActActivityVO.type != null and comActActivityVO.type==2 '>" + "AND a.volunteer_max=0 "
+ " </if> " + " group by a.id " + " order by a.status asc,a.publish_at desc " + "</script>")
IPage<ComActActivityVO> pageActivity(Page page, @Param("comActActivityVO") ComActActivityVO comActActivityVO);
- @Select("SELECT " + "u.name sponsorName, " + "ca.name communityName, "
- + "count(if(s.is_volunteer=1,s.id,null))volunteer_now, "
- + "count(if(s.is_volunteer=0,s.id,null))participant_now, " + "a.* " + "FROM " + "com_act_activity a "
- + "left join sys_user u on a.sponsor_id=u.user_id " + "left join com_act_act_sign s on a.id=s.activity_id "
- + "left join com_act ca on a.community_id=ca.community_id " + "where a.id=#{id} " + " group by a.id ")
- ComActActivityVO inforActivity(Long id);
+// @Select("SELECT " + "u.name sponsorName, " + "ca.name communityName, "
+// + "count(if(s.is_volunteer=1,s.id,null))volunteer_now, "
+// + "count(if(s.is_volunteer=0,s.id,null))participant_now, " + "a.* " + "FROM " + "com_act_activity a "
+// + "left join sys_user u on a.sponsor_id=u.user_id " + "left join com_act_act_sign s on a.id=s.activity_id "
+// + "left join com_act ca on a.community_id=ca.community_id " + "where a.id=#{id} " + " group by a.id ")
+
+ /**
+ * 活动详情
+ * @param id
+ * @return
+ */
+ ComActActivityVO inforActivity(@Param("id") Long id);
@Select("SELECT " + "a.* " + "FROM " + "com_act_act_sign s " + "JOIN com_act_activity a ON s.activity_id = a.id "
+ "WHERE " + "s.user_id = #{comActActivityVO.sponsorId} " + "ORDER BY " + "s.create_at DESC")
@@ -209,4 +216,19 @@
* @return 活动列表
*/
List<ComActActivityVO> getIndexTopActivityList(@Param("communityId") Long communityId);
+
+ /**
+ * 获取活动类型（目前只有志愿者活动需要获取）
+ * @param communityId
+ * @param type
+ * @return
+ */
+ List<ComActActivityTypeVO> listActivityType(@Param("communityId") Long communityId, @Param("type") Integer type);
+
+ /**
+ * 添加活动类型
+ * @param comActActivityTypeVO
+ * @return
+ */
+ int addActivityType(@Param("comActActivityTypeVO") ComActActivityTypeVO comActActivityTypeVO);
}
--
Gitblit v1.7.1