From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/ActivenessServiceImpl.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 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..c4dbc4b 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.dto.MgtStoreCurriculumEditDto;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;
@@ -64,7 +65,9 @@
activeness.setEndDay(mgtActivenessEditDto.getEndDay());
this.saveOrUpdate(activeness);
}
-
+
+
+
/**
* @description 删除活跃度
* @author jqs
@@ -89,11 +92,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