From 1fdfb56613adca09a0ddf39289b41f96fa335a01 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 23 七月 2025 17:55:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/lmk/mapper/ActivityMapper.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/mapper/ActivityMapper.java b/framework/src/main/java/cn/lili/modules/lmk/mapper/ActivityMapper.java
index ac7f14b..c895d2e 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/mapper/ActivityMapper.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/mapper/ActivityMapper.java
@@ -1,7 +1,6 @@
package cn.lili.modules.lmk.mapper;
import cn.lili.modules.lmk.domain.entity.Activity;
-import cn.lili.modules.lmk.domain.entity.CustomerBlack;
import cn.lili.modules.lmk.domain.query.*;
import cn.lili.modules.lmk.domain.vo.ActivityReportVO;
import cn.lili.modules.lmk.domain.vo.ActivityVO;
@@ -32,18 +31,19 @@
ActivityVO getById(String id);
/**
- * 鍒嗛〉
+ * 绠＄悊绔垎椤�
*/
IPage getPage(IPage page, @Param("query") ActivityQuery query);
+
+ /**
+ * 鍟嗗绔鍒嗛〉
+ */
+ IPage storeGetPage(IPage page, @Param("query") ActivityQuery query);
IPage getMembers(IPage page, @Param("query") ActivityMembersQuery query);
- List<MyActivityVo> getMyActivityList(@Param("query")MyActivityQuery query);
-
- int cancelActivity(String id);
-
- ActivityReportVO getActivityReport(@Param("query")ActivityReportQuery query);
+ List<MyActivityVo> getMyActivityList(@Param("query")MyActivityQuery query,@Param("userId") String userId);
/**
* 鎵归噺鏇存柊娲诲姩
@@ -51,4 +51,7 @@
* @return 鍙楀奖鍝嶇殑琛屾暟
*/
int batchUpdateActivities(@Param("list") List<Activity> activityList);
+
+
+ IPage getCanReportPage(IPage page,@Param("query") ActivityQuery query);
}
--
Gitblit v1.8.0