From 82c69b99bb31dede23cde31eaf09f12f3e79f297 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 24 八月 2023 16:58:49 +0800
Subject: [PATCH] 新增小程序积分列表 修改积分发放流程
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActSignDAO.java | 90 +++++++++++++++++++++++++++++----------------
1 files changed, 58 insertions(+), 32 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActSignDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActSignDAO.java
index 2932a77..69d564c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActSignDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActSignDAO.java
@@ -3,6 +3,8 @@
import java.util.List;
import java.util.Map;
+import com.panzhihua.common.model.vos.community.ActivitySignInRecordVO;
+import com.panzhihua.common.model.vos.community.ComActActSignExcelVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -24,42 +26,52 @@
@Mapper
public interface ComActActSignDAO extends BaseMapper<ComActActSignDO> {
// 居民 党员 志愿者 1 2 3
- @Select("<script> " + "SELECT " + "u.user_id id, " + "u.image_url, " + "u.name, " + "u.nick_name, "
- + "case WHEN u.is_partymember = 1 THEN '党员' WHEN a.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity, "
- + "u.phone, " + "a.create_at, " + "a.is_volunteer " + "FROM " + "com_act_act_sign a "
- + "JOIN sys_user u ON a.user_id = u.user_id " + "WHERE " + "a.activity_id = #{activitySignVO.activityId} "
- + "<if test='activitySignVO.phone != null and activitySignVO.phone != ""'>"
- + "AND u.phone = #{activitySignVO.phone} " + " </if> "
- + "<if test='activitySignVO.name != null and activitySignVO.name != ""'>"
- + "AND u.`name` = #{activitySignVO.name} " + " </if> "
- + "<if test='activitySignVO.identity != null and activitySignVO.identity != "" and activitySignVO.identity==1'>"
- + "AND u.is_partymember = 0 and a.is_volunteer=0 " + " </if> "
- + "<if test='activitySignVO.identity != null and activitySignVO.identity != "" and activitySignVO.identity==2'>"
- + "AND u.is_partymember = 1 " + " </if> "
- + "<if test='activitySignVO.identity != null and activitySignVO.identity != "" and activitySignVO.identity==3'>"
- + "AND a.is_volunteer=1 " + " </if> " + "<if test='activitySignVO.type != null and activitySignVO.type != 0'>"
- + "AND a.is_volunteer=#{activitySignVO.type}-1 " + " </if> " + " order by a.create_at desc " + "</script>")
+// @Select("<script> " + "SELECT " + "u.user_id id, " + "u.image_url, " + "u.name, " + "u.nick_name, "
+// + "case WHEN u.is_partymember = 1 THEN '党员' WHEN a.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity, "
+// + "u.phone, " + "u.tags, " + "a.create_at, " + "a.is_volunteer, a.status , a.times ,a.reason,a.award,t.limit " + "FROM " + "com_act_act_sign a "
+// + "JOIN sys_user u ON a.user_id = u.user_id left join com_act_activity t on a.activity_id = t.id" + "WHERE " + "a.activity_id = #{activitySignVO.activityId} "
+// + "<if test='activitySignVO.phone != null and activitySignVO.phone != ""'>"
+// + "AND u.phone = #{activitySignVO.phone} " + " </if> "
+// + "<if test='activitySignVO.status != null'>"
+// + "AND a.status = #{activitySignVO.status} " + " </if> "
+// + "<if test='activitySignVO.tags != null and activitySignVO.tags != ""'>"
+// + "AND u.tags like concat('%',#{activitySignVO.tags},'%') " + " </if> "
+// + "<if test='activitySignVO.name != null and activitySignVO.name != ""'>"
+// + "AND u.`name` = #{activitySignVO.name} " + " </if> "
+// + "<if test='activitySignVO.identity != null and activitySignVO.identity != "" and activitySignVO.identity==1'>"
+// + "AND u.is_partymember = 0 and a.is_volunteer=0 " + " </if> "
+// + "<if test='activitySignVO.identity != null and activitySignVO.identity != "" and activitySignVO.identity==2'>"
+// + "AND u.is_partymember = 1 " + " </if> "
+// + "<if test='activitySignVO.identity != null and activitySignVO.identity != "" and activitySignVO.identity==3'>"
+// + "AND a.is_volunteer=1 " + " </if> " + "<if test='activitySignVO.type != null and activitySignVO.type != 0'>"
+// + "AND a.is_volunteer=#{activitySignVO.type}-1 " + " </if> " + " order by a.create_at desc " + "</script>")
IPage<ActivitySignVO> listActivitySign(Page page, @Param("activitySignVO") ActivitySignVO activitySignVO);
- @Select("<script> " + "SELECT " + "u.user_id id, " + "u.image_url, " + "u.name, " + "u.nick_name, "
- + "case WHEN u.is_partymember = 1 THEN '党员' WHEN a.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity, "
- + "u.phone, " + "u.openid, " + "a.create_at, " + "a.is_volunteer " + "FROM " + "com_act_act_sign a "
- + "JOIN sys_user u ON a.user_id = u.user_id " + "WHERE " + "a.activity_id = #{activitySignVO.activityId} "
- + "<if test='activitySignVO.phone != null and activitySignVO.phone != ""'>"
- + "AND u.phone = #{activitySignVO.phone} " + " </if> "
- + "<if test='activitySignVO.name != null and activitySignVO.name != ""'>"
- + "AND u.`name` = #{activitySignVO.name} " + " </if> "
- + "<if test='activitySignVO.identity != null and activitySignVO.identity != "" and activitySignVO.identity==1'>"
- + "AND u.is_partymember = 0 and a.is_volunteer=0 " + " </if> "
- + "<if test='activitySignVO.identity != null and activitySignVO.identity != "" and activitySignVO.identity==2'>"
- + "AND u.is_partymember = 1 " + " </if> "
- + "<if test='activitySignVO.identity != null and activitySignVO.identity != "" and activitySignVO.identity==3'>"
- + "AND a.is_volunteer=1 " + " </if> " + "<if test='activitySignVO.type != null and activitySignVO.type != 0'>"
- + "AND a.is_volunteer=#{activitySignVO.type}-1 " + " </if> " + " order by a.create_at desc " + "</script>")
+ IPage<ActivitySignVO> listActivitySignParty(Page page, @Param("activitySignVO") ActivitySignVO activitySignVO);
+
+//@Select("<script> " + "SELECT " + "u.user_id id, " + "u.image_url, " + "u.name, " + "u.nick_name, u.openid, "
+// + "CASE WHEN a.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity, "
+// + "u.phone, " + "u.tags, " + "a.create_at, " + "a.is_volunteer, a.status , a.reason, t.limit " + "FROM " + "com_act_act_sign a "
+// + "JOIN sys_user u ON a.user_id = u.user_id left join com_act_activity t on a.activity_id = t.id " + "WHERE " + "a.activity_id = #{activitySignVO.activityId} "
+// + "<if test='activitySignVO.phone != null and activitySignVO.phone != ""'>"
+// + "AND u.phone = #{activitySignVO.phone} " + " </if> "
+// + "<if test='activitySignVO.status != null'>"
+// + "AND a.status = #{activitySignVO.status} " + " </if> "
+// + "<if test='activitySignVO.name != null and activitySignVO.name != ""'>"
+// + "AND u.`name` = #{activitySignVO.name} " + " </if> "
+// + "<if test='activitySignVO.identity != null and activitySignVO.identity != "" and activitySignVO.identity==1'>"
+// + "AND u.is_partymember = 0 and a.is_volunteer=0 " + " </if> "
+// + "<if test='activitySignVO.identity != null and activitySignVO.identity != "" and activitySignVO.identity==2'>"
+// + "AND u.is_partymember = 1 " + " </if> "
+// + "<if test='activitySignVO.identity != null and activitySignVO.identity != "" and activitySignVO.identity==3'>"
+// + "AND a.is_volunteer=1 " + " </if> " + "<if test='activitySignVO.type != null and activitySignVO.type != 0'>"
+// + "AND a.is_volunteer=#{activitySignVO.type}-1 " + " </if> " + " order by a.create_at desc " + "</script>")
List<ActivitySignVO> listActivitySigns(@Param("activitySignVO") ActivitySignVO activitySignVO);
- @Select("<script> " + "SELECT " + " caas.user_id, " + " su.NAME, " + "CASE " + " WHEN su.is_volunteer = 1 THEN "
- + " '志愿者' ELSE '居民' " + " END identity, " + " su.phone, " + " caas.create_at " + "FROM "
+ List<ComActActSignExcelVO> getSignLists (@Param("activitySignVO") ActivitySignVO activitySignVO);
+
+ @Select("<script> " + "SELECT " + " caas.user_id, " + " su.NAME, " + "CASE WHEN caas.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity, "
+ + " su.phone, " + " caas.create_at " + "FROM "
+ " com_act_act_sign AS caas "
+ " LEFT JOIN sys_user AS su ON su.user_id = caas.user_id where caas.activity_id = #{activityPeopleListDTO.activityId} "
+ "<if test='activityPeopleListDTO.phone != null and activityPeopleListDTO.phone != ""'>"
@@ -80,4 +92,18 @@
* @return 需要默认好评的记录列表
*/
List<ComActActSignDO> selectNeedEvaluateSignRecords(@Param("activityIds") List<Long> activityIds);
+
+ /**
+ * 获取活动报名签到记录
+ * @param id 活动主键id
+ * @return
+ */
+ List<ActivitySignInRecordVO> listSignInRecord(@Param("id") Long id);
+
+ /**
+ * 获取用户活动报名记录
+ * @param userId
+ * @return
+ */
+ List<ActivitySignVO> selectList(@Param("userId") Long userId);
}
--
Gitblit v1.7.1