From 780bf6eb11cc2d2d3c0feb4637e3daefdffccf2c Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 07 七月 2022 11:26:24 +0800
Subject: [PATCH] 问题清单bug处理
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java
index 157995a..11444a3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java
@@ -54,8 +54,10 @@
+ "left join sys_user u on a.sponsor_id=u.user_id " + "left join (select * from com_act_act_sign where `status` = 1) s on a.id=s.activity_id "
+ "left join com_act ca on a.community_id=ca.community_id " + " where 1=1 " +
- "<if test='comActActivityVO.choice == 0 '>" + "AND a.community_id = ${comActActivityVO.communityId} " + " </if> "
+ "<if test='comActActivityVO.communityId != null and comActActivityVO.communityId!=0'>" + "AND a.community_id = ${comActActivityVO.communityId} " + " </if> "
+
+ "<if test='comActActivityVO.phone != null and comActActivityVO.phone!=""'>" + "AND a.phone = ${comActActivityVO.phone} " + " </if> "
+ +
"<if test='comActActivityVO.areaCode !=null '>" + "AND ca.area_code = ${comActActivityVO.areaCode} " + " </if> "
+
@@ -337,4 +339,13 @@
* @return
*/
List<PartyMemberDetailExcelVO> exportPartyMemberDetail(@Param("commonPage") CommonPage commonPage);
+
+ List<ComActActivityVO> selectListByRelationId(@Param("relationId") Long relationId,@Param("date")String date);
+
+ /**
+ * 查询进行中活动
+ * @param communityId 社区id
+ * @return 活动列表
+ */
+ List<ComActActivityVO> selectListByCommunityId(@Param("communityId") Long communityId,@Param("date") String date);
}
--
Gitblit v1.7.1