From 9c6fd541f0aa8e384c26998597a6788bb77eca8d Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 04 七月 2023 14:56:25 +0800
Subject: [PATCH] 商户端营销统计

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/ActivenessServiceImpl.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/ActivenessServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/ActivenessServiceImpl.java
index b7ea447..e8554cb 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/ActivenessServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/ActivenessServiceImpl.java
@@ -1,12 +1,13 @@
 package com.ruoyi.system.service.impl.config;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
 import com.ruoyi.system.api.domain.poji.config.Activeness;
 import com.ruoyi.system.domain.dto.MgtActivenessEditDto;
+import com.ruoyi.system.domain.vo.MgtActivenessListVo;
 import com.ruoyi.system.mapper.config.ActivenessMapper;
 import com.ruoyi.system.service.config.ActivenessService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -89,11 +90,13 @@
      * @return  List<String>
      */
     @Override
-    public List<String> getActivenessList(){
+    public List<MgtActivenessListVo> getActivenessList(){
         List<Activeness> activenessList = activenessMapper.selectList(new LambdaQueryWrapper<Activeness>().eq(Activeness::getDelFlag, 0));
-        List<String> nameList = activenessList.stream().map(activeness ->{
-                    String name = activeness.getActivenessName();
-                    return name;
+        List<MgtActivenessListVo> nameList = activenessList.stream().map(activeness ->{
+                    MgtActivenessListVo mgtActivenessListVo = new MgtActivenessListVo();
+                    mgtActivenessListVo.setActivenessId(activeness.getActivenessId());
+                    mgtActivenessListVo.setActivenessName(activeness.getActivenessName());
+                    return mgtActivenessListVo;
                 }).collect(Collectors.toList());
         return nameList;
     }

--
Gitblit v1.7.1