Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-04-01 8444084e6aa11efa23287e7f82474ac22378a5c4

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/ActivenessServiceImpl.java

@@ -1,17 +1,19 @@
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;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

/**
 * <p>
@@ -63,7 +65,9 @@
        activeness.setEndDay(mgtActivenessEditDto.getEndDay());
        this.saveOrUpdate(activeness);
    }

    
    
    
    /**
     * @description  删除活跃度
     * @author  jqs
@@ -79,4 +83,36 @@
        activeness.setUpdateUserId(mgtBaseGetDto.getUserId());
        this.saveOrUpdate(activeness);
    }

    /**
     * @description  获取活跃度list
     * @author  jqs
     * @date    2023/6/29 17:12
     * @param
     * @return  List<String>
     */
    @Override
    public List<MgtActivenessListVo> getActivenessList(){
        List<Activeness> activenessList = activenessMapper.selectList(new LambdaQueryWrapper<Activeness>().eq(Activeness::getDelFlag, 0));
        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;
    }

    /**
     * @description  通过名称获取活跃度
     * @author  jqs
     * @date    2023/6/29 17:18
     * @param activenessName
     * @return  Activeness
     */
    @Override
    public Activeness getActivenessByName(String activenessName){
        Activeness activeness = this.getOne(new LambdaQueryWrapper<Activeness>().eq(Activeness::getDelFlag, 0).eq(Activeness::getActivenessName, activenessName),false);
        return activeness;
    }
}