diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/TeamApplicationDTO.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/TeamApplicationDTO.java index 0396bad8..3fec62b7 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/TeamApplicationDTO.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/TeamApplicationDTO.java @@ -35,6 +35,9 @@ public class TeamApplicationDTO extends BaseDTO { @Schema(description = "工作流定义ID") private Long workflowDefinitionId; + @Schema(description = "工作流名称") + private String workflowDefinitionName; + @Schema(description = "团队名称") private String teamName; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/TeamApplicationServiceImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/TeamApplicationServiceImpl.java index f5f4132f..1622b73a 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/TeamApplicationServiceImpl.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/TeamApplicationServiceImpl.java @@ -17,6 +17,8 @@ import com.qqchen.deploy.backend.deploy.service.ITeamApplicationService; import com.qqchen.deploy.backend.framework.enums.ResponseCode; import com.qqchen.deploy.backend.framework.exception.BusinessException; import com.qqchen.deploy.backend.framework.service.impl.BaseServiceImpl; +import com.qqchen.deploy.backend.workflow.entity.WorkflowDefinition; +import com.qqchen.deploy.backend.workflow.repository.IWorkflowDefinitionRepository; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Page; @@ -46,6 +48,9 @@ public class TeamApplicationServiceImpl extends BaseServiceImpl workflowDefinitionIds = teamApps.stream() + .map(TeamApplicationDTO::getWorkflowDefinitionId) + .filter(Objects::nonNull) + .collect(Collectors.toSet()); + // 2. 批量查询团队信息 Map teamMap = new HashMap<>(); if (!teamIds.isEmpty()) { @@ -124,7 +134,15 @@ public class TeamApplicationServiceImpl extends BaseServiceImpl workflowMap = new HashMap<>(); + if (!workflowDefinitionIds.isEmpty()) { + workflowDefinitionRepository.findAllById(workflowDefinitionIds).forEach(workflow -> + workflowMap.put(workflow.getId(), workflow) + ); + } + + // 6. 填充扩展字段 teamApps.forEach(teamApp -> { // 填充团队名称 if (teamApp.getTeamId() != null) { @@ -150,6 +168,14 @@ public class TeamApplicationServiceImpl extends BaseServiceImpl