From 59beb88bdf1f8bedd5538580e50038ffee6985d9 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 06 六月 2025 15:24:58 +0800
Subject: [PATCH] 优化我的收藏,活动报名,我的活动页面,活动页面后端逻辑,新增加载更多接口

---
 framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java
index 5999d78..cd97862 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java
@@ -3,12 +3,9 @@
 import cn.lili.base.Result;
 import cn.lili.common.enums.ActivityStatusEnum;
 import cn.lili.modules.lmk.domain.entity.Activity;
-import cn.lili.modules.lmk.domain.entity.ActivityReport;
 import cn.lili.modules.lmk.domain.form.ActivityForm;
-import cn.lili.modules.lmk.domain.form.ActivityReportForm;
 import cn.lili.modules.lmk.domain.query.ActivityMembersQuery;
 import cn.lili.modules.lmk.domain.query.ActivityQuery;
-import cn.lili.modules.lmk.domain.vo.ActivityReportVO;
 import cn.lili.modules.lmk.domain.vo.ActivityVO;
 import cn.lili.modules.lmk.mapper.ActivityMapper;
 import cn.lili.modules.lmk.mapper.ActivityReportMapper;
@@ -18,7 +15,6 @@
 import cn.lili.modules.member.entity.vo.MemberVO;
 import cn.lili.utils.PageUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import io.micrometer.core.instrument.util.StringUtils;
 import lombok.RequiredArgsConstructor;
@@ -117,15 +113,25 @@
         Assert.notNull(vo, "璁板綍涓嶅瓨鍦�");
         return Result.ok().data(vo);
     }
+    @Override
+    public Result getCanReportPage(ActivityQuery query){
+        IPage<ActivityVO> page = PageUtil.getPage(query, ActivityVO.class);
 
+        baseMapper.getCanReportPage(page, query);
+        return Result.ok().data(page.getRecords()).total(page.getTotal());
+    }
 
     @Override
     public Result all() {
+
         List<Activity> entities = baseMapper.selectList(null);
         List<ActivityVO> vos = entities.stream()
                 .map(entity -> ActivityVO.getVoByEntity(entity, null))
                 .collect(Collectors.toList());
         List<ActivityVO> reportActivityVo =vos.stream().filter(item -> ActivityStatusEnum.REPORT.getType().equals(item.getStatus())).collect(Collectors.toList());
+
+
+
         return Result.ok().data(reportActivityVo);
     }
 

--
Gitblit v1.8.0