From ccc8bc591edeab0d7e6d0080e587de29a54659ea Mon Sep 17 00:00:00 2001
From: dengqichen <dengqichen@iscmtech.com>
Date: Fri, 7 Nov 2025 17:02:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E4=BA=86JENKINS=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deploy/dto/TeamApplicationDTO.java        |  3 ++
 .../impl/TeamApplicationServiceImpl.java      | 28 ++++++++++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

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<TeamApplication,
     @Resource
     private IEnvironmentRepository environmentRepository;
 
+    @Resource
+    private IWorkflowDefinitionRepository workflowDefinitionRepository;
+
     @Resource
     private TeamApplicationConverter teamApplicationConverter;
 
@@ -100,6 +105,11 @@ public class TeamApplicationServiceImpl extends BaseServiceImpl<TeamApplication,
             .filter(Objects::nonNull)
             .collect(Collectors.toSet());
 
+        Set<Long> workflowDefinitionIds = teamApps.stream()
+            .map(TeamApplicationDTO::getWorkflowDefinitionId)
+            .filter(Objects::nonNull)
+            .collect(Collectors.toSet());
+
         // 2. 批量查询团队信息
         Map<Long, Team> teamMap = new HashMap<>();
         if (!teamIds.isEmpty()) {
@@ -124,7 +134,15 @@ public class TeamApplicationServiceImpl extends BaseServiceImpl<TeamApplication,
             );
         }
 
-        // 5. 填充扩展字段
+        // 5. 批量查询工作流定义信息
+        Map<Long, WorkflowDefinition> 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<TeamApplication,
                     teamApp.setEnvironmentName(env.getEnvName());
                 }
             }
+
+            // 填充工作流定义名称
+            if (teamApp.getWorkflowDefinitionId() != null) {
+                WorkflowDefinition workflow = workflowMap.get(teamApp.getWorkflowDefinitionId());
+                if (workflow != null) {
+                    teamApp.setWorkflowDefinitionName(workflow.getName());
+                }
+            }
         });
     }