From 8f7d21a82f9f02135f2eb8ea236a3cd18f3179a8 Mon Sep 17 00:00:00 2001
From: cjw <miko20001@163.com>
Date: Sat, 12 Oct 2024 14:22:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=90=8D=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/scale/domain/vo/ActivityVo.java     |  5 +++++
 .../scale/service/impl/ActivityServiceImpl.java     | 13 ++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ActivityVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ActivityVo.java
index cf1a93b..50cfaf4 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ActivityVo.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ActivityVo.java
@@ -81,5 +81,10 @@ public class ActivityVo implements Serializable {
     @ExcelProperty(value = "活动状态")
     private Integer status;
 
+    /**
+     * 报名状态
+     */
+    private Integer joinFlag;
+
 
 }
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ActivityServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ActivityServiceImpl.java
index c3bad28..7b757c9 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ActivityServiceImpl.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ActivityServiceImpl.java
@@ -8,6 +8,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.scale.domain.ActivityEnter;
+import org.dromara.scale.mapper.ActivityEnterMapper;
 import org.springframework.stereotype.Service;
 import org.dromara.scale.domain.bo.ActivityBo;
 import org.dromara.scale.domain.vo.ActivityVo;
@@ -31,6 +34,8 @@ public class ActivityServiceImpl implements IActivityService {
 
     private final ActivityMapper baseMapper;
 
+    private final ActivityEnterMapper enterMapper;
+
     /**
      * 查询活动
      *
@@ -40,7 +45,13 @@ public class ActivityServiceImpl implements IActivityService {
     @Override
     public ActivityVo queryById(Long id) {
         baseMapper.addViewNum(id);
-        return baseMapper.selectVoById(id);
+        Long userId = LoginHelper.getUserId();
+        Long l = enterMapper.selectCount(new LambdaQueryWrapper<ActivityEnter>()
+            .eq(ActivityEnter::getActivityId, id)
+            .eq(ActivityEnter::getCreateBy, userId));
+        ActivityVo activityVo = baseMapper.selectVoById(id);
+        activityVo.setJoinFlag(l.intValue());
+        return activityVo;
     }
 
     /**