From 1de0a85c067ceb62413d0f458899dca41b8322d0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 17 十一月 2022 17:07:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActSignDAO.java | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 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 9d57ff5..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
@@ -47,23 +47,25 @@
// + "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, 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>")
+ 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);
List<ComActActSignExcelVO> getSignLists (@Param("activitySignVO") ActivitySignVO activitySignVO);
--
Gitblit v1.7.1