From c6512655e722d9ca80dd8c34b79f6d3923ecf86c Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 22 六月 2021 16:07:50 +0800
Subject: [PATCH] Merge branch 'test' into 'test_screen'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActSignDAO.java |   70 ++++++++++++++++++++++------------
 1 files changed, 45 insertions(+), 25 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 a36855e..3d1d48f 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
@@ -1,9 +1,14 @@
 package com.panzhihua.service_community.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
 import com.panzhihua.common.model.vos.community.ActivitySignVO;
+import com.panzhihua.common.model.vos.community.screen.work.ActActivityPeopleListVO;
 import com.panzhihua.service_community.model.dos.ComActActSignDO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -16,40 +21,55 @@
  **/
 @Mapper
 public interface ComActActSignDAO extends BaseMapper<ComActActSignDO> {
+//    居民 党员 志愿者 1 2 3
     @Select("<script> " +
-            "SELECT\n" +
-            "a.id,\n" +
-            "u.NAME,\n" +
-            "CASE\n" +
-            "\n" +
-            "WHEN u.is_partymember = 1 THEN\n" +
-            "'党员' \n" +
-            "WHEN u.is_volunteer = 1 THEN\n" +
-            "'支援者' ELSE '居民' \n" +
-            "END identity,\n" +
-            "u.phone,\n" +
-            "a.create_at \n" +
-            "FROM\n" +
-            "com_act_act_sign a\n" +
-            "JOIN sys_user u ON a.user_id = u.user_id \n" +
-            "WHERE\n" +
-            "a.activity_id = #{activityId} \n" +
+            "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 = #{activityId}  " +
             "<if test='phone != null and phone.trim() != &quot;&quot;'>" +
-            "AND u.phone = #{phone} \n" +
+            "AND u.phone = #{phone}  " +
             " </if> " +
             "<if test='name != null and name.trim() != &quot;&quot;'>" +
-            "AND u.`name` = #{name} \n" +
+            "AND u.`name` = #{name}  " +
             " </if> " +
-            "<if test='identity != null and identity.trim() != &quot;&quot; and identity=党员'>" +
-            "AND is_partymember = 1 \n" +
+            "<if test='identity != null and identity.trim() != &quot;&quot; and identity==1'>" +
+            "AND u.is_partymember = 0 and a.is_volunteer=0  " +
             " </if> " +
-            "<if test='identity != null and identity.trim() != &quot;&quot; and identity=志愿者'>" +
-            "AND is_partymember = 2 and is_volunteer=1  \n" +
+            "<if test='identity != null and identity.trim() != &quot;&quot; and identity==2'>" +
+            "AND u.is_partymember = 1    " +
             " </if> " +
-            "<if test='identity != null and identity.trim() != &quot;&quot; and identity=居民'>" +
-            "AND is_partymember = 2 and is_volunteer=2  \n" +
+            "<if test='identity != null and identity.trim() != &quot;&quot; and identity==3'>" +
+            "AND a.is_volunteer=1   " +
+            " </if> " +
+            "<if test='type != null and type != 0'>" +
+            "AND a.is_volunteer=#{type}-1   " +
             " </if> " +
             " order by a.create_at desc "+
             "</script>")
     List<ActivitySignVO> listActivitySign(ActivitySignVO activitySignVO);
+
+    @Select("SELECT " +
+            " caas.user_id, " +
+            " su.NAME, " +
+            "CASE " +
+            "  WHEN su.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}")
+    IPage<ActActivityPeopleListVO> getActActivityPeopleList(Page page,@Param("activityPeopleListDTO") ScreenActActivityPeopleListDTO activityPeopleListDTO);
 }

--
Gitblit v1.7.1