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 | 74 ++++++++++++++++++++++++++++++------
1 files changed, 61 insertions(+), 13 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 3d1d48f..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
@@ -36,30 +36,68 @@
"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() != ""'>" +
- "AND u.phone = #{phone} " +
+ "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} " +
+ "<if test='activitySignVO.name != null and activitySignVO.name != ""'>" +
+ "AND u.`name` = #{activitySignVO.name} " +
" </if> " +
- "<if test='identity != null and identity.trim() != "" and identity==1'>" +
+ "<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==2'>" +
+ "<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==3'>" +
+ "<if test='activitySignVO.identity != null and activitySignVO.identity != "" and activitySignVO.identity==3'>" +
"AND a.is_volunteer=1 " +
" </if> " +
- "<if test='type != null and type != 0'>" +
- "AND a.is_volunteer=#{type}-1 " +
+ "<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("SELECT " +
+ @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 " +
@@ -70,6 +108,16 @@
" 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}")
+ " 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