From b2690b02f12d529ec7bb45e059c6d2eef59b7f2c Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期五, 25 四月 2025 16:36:06 +0800 Subject: [PATCH] 原始检测项管理 --- ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TProjectTeamServiceImpl.java | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TProjectTeamServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TProjectTeamServiceImpl.java index a397983..534fc00 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TProjectTeamServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TProjectTeamServiceImpl.java @@ -1,10 +1,22 @@ package com.ruoyi.system.service.impl; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.basic.PageInfo; import com.ruoyi.system.mapper.TProjectTeamMapper; +import com.ruoyi.system.mapper.TProjectTeamStaffMapper; import com.ruoyi.system.model.TProjectTeam; +import com.ruoyi.system.model.TProjectTeamStaff; +import com.ruoyi.system.query.TProjectTeamQuery; import com.ruoyi.system.service.TProjectTeamService; +import com.ruoyi.system.vo.SysOperLogVO; +import com.ruoyi.system.vo.TProjectTeamVO; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; + +import java.util.List; +import java.util.stream.Collectors; /** * <p> @@ -17,4 +29,22 @@ @Service public class TProjectTeamServiceImpl extends ServiceImpl<TProjectTeamMapper, TProjectTeam> implements TProjectTeamService { + @Autowired + private TProjectTeamStaffMapper projectTeamStaffMapper; + + @Override + public PageInfo<TProjectTeamVO> pageList(TProjectTeamQuery query) { + PageInfo<TProjectTeamVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); + List<TProjectTeamVO> list = this.baseMapper.pageList(query,pageInfo); + List<String> teamIds = list.stream().map(TProjectTeamVO::getId).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(teamIds)){ + List<TProjectTeamStaff> projectTeamStaffs = projectTeamStaffMapper.selectList(Wrappers.lambdaQuery(TProjectTeamStaff.class).in(TProjectTeamStaff::getTeamId, teamIds)); + list.forEach(item->{ + List<TProjectTeamStaff> projectTeamStaffList = projectTeamStaffs.stream().filter(staff -> staff.getTeamId().equals(item.getId())).collect(Collectors.toList()); + item.setStaffs(projectTeamStaffList); + }); + } + pageInfo.setRecords(list); + return pageInfo; + } } -- Gitblit v1.7.1