From 053f6187b5f6cda1725ed63df8a8766b5976fb53 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 06 八月 2025 09:01:35 +0800
Subject: [PATCH] 菌种库所有代码
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TProjectTeamServiceImpl.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 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 4f87d16..ef88719 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
@@ -41,8 +41,30 @@
List<String> teamIds = list.stream().map(TProjectTeamVO::getId).collect(Collectors.toList());
List<SysUser> sysUsers = sysUserMapper.selectList();
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());
+ if(!CollectionUtils.isEmpty(projectTeamStaffList)){
+ List<String> staffIds = projectTeamStaffList.stream().map(TProjectTeamStaff::getUserId).collect(Collectors.toList());
+ List<SysUser> staffs = sysUsers.stream().filter(sysUser -> staffIds.contains(sysUser.getUserId()+"")).collect(Collectors.toList());
+ item.setStaffName(staffs.stream().map(SysUser::getNickName).collect(Collectors.joining(",")));
+ }
+ item.setStaffs(projectTeamStaffList);
+ });
+ }
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
+ @Override
+ public PageInfo<TProjectTeamVO> pageList1(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());
+ List<SysUser> sysUsers = sysUserMapper.selectList();
+ if(!CollectionUtils.isEmpty(teamIds)){
List<TProjectTeamStaff> projectTeamStaffs = projectTeamStaffMapper.selectList(Wrappers.lambdaQuery(TProjectTeamStaff.class)
- .eq(TProjectTeamStaff::getRoleType,3).in(TProjectTeamStaff::getTeamId, teamIds));
+ .eq(TProjectTeamStaff::getRoleType,3)
+ .in(TProjectTeamStaff::getTeamId, teamIds));
list.forEach(item->{
List<TProjectTeamStaff> projectTeamStaffList = projectTeamStaffs.stream().filter(staff -> staff.getTeamId().equals(item.getId())).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(projectTeamStaffList)){
--
Gitblit v1.7.1