From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActSignDAO.java | 124 ++++++++++++++++++++++++++++++++---------
1 files changed, 96 insertions(+), 28 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..89b5126 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,103 @@
**/
@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" +
- "<if test='phone != null and phone.trim() != ""'>" +
- "AND u.phone = #{phone} \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 = #{activitySignVO.activityId} " +
+ "<if test='activitySignVO.phone != null and activitySignVO.phone != ""'>" +
+ "AND u.phone = #{activitySignVO.phone} " +
" </if> " +
- "<if test='name != null and name.trim() != ""'>" +
- "AND u.`name` = #{name} \n" +
+ "<if test='activitySignVO.name != null and activitySignVO.name != ""'>" +
+ "AND u.`name` = #{activitySignVO.name} " +
" </if> " +
- "<if test='identity != null and identity.trim() != "" and identity=党员'>" +
- "AND is_partymember = 1 \n" +
+ "<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='identity != null and identity.trim() != "" and identity=志愿者'>" +
- "AND is_partymember = 2 and is_volunteer=1 \n" +
+ "<if test='activitySignVO.identity != null and activitySignVO.identity != "" and activitySignVO.identity==2'>" +
+ "AND u.is_partymember = 1 " +
" </if> " +
- "<if test='identity != null and identity.trim() != "" and identity=居民'>" +
- "AND is_partymember = 2 and is_volunteer=2 \n" +
+ "<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> listActivitySign(ActivitySignVO activitySignVO);
+ 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, " +
+ "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>")
+ 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 " +
+ " 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 != ""'>" +
+ " and su.phone like concat (#{activityPeopleListDTO.phone},'%') "+
+ " </if> " +
+ "<if test='activityPeopleListDTO.cardNo != null and activityPeopleListDTO.cardNo != ""'>" +
+ " AND su.id_card = #{activityPeopleListDTO.cardNo} " +
+ " </if> " +
+ "<if test='activityPeopleListDTO.name != null and activityPeopleListDTO.name != ""'>" +
+ " AND su.name like concat (#{activityPeopleListDTO.name},'%') "+
+ " </if> " +
+ " </script>")
+ IPage<ActActivityPeopleListVO> getActActivityPeopleList(Page page,@Param("activityPeopleListDTO") ScreenActActivityPeopleListDTO activityPeopleListDTO);
}
--
Gitblit v1.7.1