From 307be50c144c92afade80ffdec9279617235f42e Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Wed, 3 Jul 2024 15:21:13 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=B8=AD=E5=BF=83=E6=94=AF=E6=8C=81=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E7=BB=84=E7=88=B6=E5=AD=90=E5=B1=82=E7=BA=A7=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--story=1015333 --user=宋昌昌 【测试计划】完成剩余功能 https://www.tapd.cn/55049933/s/1543343
---
 .../system/dto/taskcenter/TaskCenterDTO.java  |  6 ++++
 .../plan/mapper/ExtTestPlanReportMapper.java  |  2 ++
 .../plan/mapper/ExtTestPlanReportMapper.xml   | 35 +++++++++++++++++-
 .../plan/service/TestPlanService.java         |  4 +--
 .../service/TestPlanTaskCenterService.java    | 36 ++++++++++++-------
 .../TestPlanTaskCenterControllerTests.java    | 12 -------
 .../src/test/resources/dml/init_task_plan.sql |  4 ++-
 7 files changed, 70 insertions(+), 29 deletions(-)

diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/taskcenter/TaskCenterDTO.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/taskcenter/TaskCenterDTO.java
index 3bf4536104..182a474b5e 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/taskcenter/TaskCenterDTO.java
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/taskcenter/TaskCenterDTO.java
@@ -5,6 +5,8 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author: LAN
@@ -66,5 +68,9 @@ public class TaskCenterDTO implements Serializable {
     @Schema(description = "执行历史是否被清理")
     private boolean historyDeleted = false;
 
+    @Schema(description = "计划组ID")
+    private String parentId;
 
+    @Schema(description = "计划组子任务")
+    private List<TaskCenterDTO> children = new ArrayList<>();
 }
diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportMapper.java b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportMapper.java
index 0da2d3a182..ae77a7164d 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportMapper.java
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportMapper.java
@@ -47,6 +47,8 @@ public interface ExtTestPlanReportMapper {
     List<TaskCenterDTO> taskCenterlist(@Param("request") TaskCenterPageRequest request, @Param("projectIds") List<String> projectIds,
                                        @Param("startTime") long startTime, @Param("endTime") long endTime);
 
+    List<TaskCenterDTO> getChildTaskCenter(@Param("ids") List<String> groupReportIds);
+
     List<TestPlanReportDetailResponse> getPlanReportListById(@Param("request") TestPlanReportDetailPageRequest request);
 
     List<ReportDTO> getReports(@Param("request") TaskCenterBatchRequest request, @Param("projectIds") List<String> projectIds,
diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportMapper.xml b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportMapper.xml
index dc0b7dc379..ded8ce65b1 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportMapper.xml
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportMapper.xml
@@ -70,8 +70,8 @@
         tpr.create_user AS operationName,
         tpr.trigger_mode,
         tpr.start_time,
+        '' as parentId,
         project.organization_id,
-
         tp.num AS resourceNum,
         tp.name AS resourceName,
         tp.id AS resourceId
@@ -81,6 +81,8 @@
         left join project on tpr.project_id = project.id
         where
         tpr.start_time BETWEEN #{startTime} AND #{endTime}
+        <!-- 独立报告 && 计划组报告 -->
+        and tpr.id = tpr.parent_id
         <if test="projectIds != null and projectIds.size() > 0">
             and
             tpr.project_id IN
@@ -96,6 +98,37 @@
         </if>
         <include refid="filter"/>
     </select>
+
+    <select id="getChildTaskCenter" resultType="io.metersphere.system.dto.taskcenter.TaskCenterDTO">
+        select
+        distinct tpr.id,
+        tpr.project_id,
+        tpr.integrated,
+        tpr.result_status as status,
+        tpr.exec_status,
+        tpr.start_time as operationTime,
+        tpr.create_user as operationName,
+        tpr.trigger_mode,
+        tpr.start_time,
+        tpr.parent_id as parentId,
+        project.organization_id,
+        tp.num as resourceNum,
+        tp.name as resourceName,
+        tp.id as resourceId
+        from
+        test_plan_report tpr
+        inner join test_plan tp ON tpr.test_plan_id = tp.id
+        left join project on tpr.project_id = project.id
+        where
+            tpr.id != tpr.parent_id
+        <if test="ids != null and ids.size() > 0">
+            and tpr.parent_id in
+            <foreach collection="ids" item="id" separator="," open="(" close=")">
+                #{id}
+            </foreach>
+        </if>
+    </select>
+
     <select id="getPlanReportListById"
             resultType="io.metersphere.plan.dto.response.TestPlanReportDetailResponse">
 
diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanService.java b/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanService.java
index 05c70c7211..77c76803e9 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanService.java
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanService.java
@@ -827,9 +827,7 @@ public class TestPlanService extends TestPlanBaseUtilsService {
         List<String> userIds = hisList.stream().map(TestPlanExecuteHisDTO::getOperationUser).distinct().toList();
         List<OptionDTO> userOptions = baseUserMapper.selectUserOptionByIds(userIds);
         Map<String, String> userMap = userOptions.stream().collect(Collectors.toMap(OptionDTO::getId, OptionDTO::getName));
-        hisList.forEach(his -> {
-            his.setOperationUser(userMap.getOrDefault(his.getOperationUser(), his.getOperationUser()));
-        });
+        hisList.forEach(his -> his.setOperationUser(userMap.getOrDefault(his.getOperationUser(), his.getOperationUser())));
         return hisList;
     }
 
diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanTaskCenterService.java b/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanTaskCenterService.java
index 9dd2888b8a..f9c61e021b 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanTaskCenterService.java
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanTaskCenterService.java
@@ -4,7 +4,6 @@ import com.github.pagehelper.Page;
 import com.github.pagehelper.page.PageMethod;
 import io.metersphere.api.dto.definition.ExecuteReportDTO;
 import io.metersphere.api.dto.report.ReportDTO;
-import io.metersphere.api.mapper.ExtApiReportMapper;
 import io.metersphere.api.mapper.ExtApiScenarioReportMapper;
 import io.metersphere.engine.MsHttpClient;
 import io.metersphere.plan.mapper.ExtTestPlanReportMapper;
@@ -78,8 +77,6 @@ public class TestPlanTaskCenterService {
     @Resource
     OperationLogService operationLogService;
     @Resource
-    ExtApiReportMapper extApiReportMapper;
-    @Resource
     ExtApiScenarioReportMapper extApiScenarioReportMapper;
     @Resource
     TestPlanExecuteService testPlanExecuteService;
@@ -132,21 +129,26 @@ public class TestPlanTaskCenterService {
         if (CollectionUtils.isNotEmpty(projectIds)) {
             Map<String, ExecuteReportDTO> historyDeletedMap = new HashMap<>();
             list = extTestPlanReportMapper.taskCenterlist(request, isSystem ? new ArrayList<>() : projectIds, DateUtils.getDailyStartTime(), DateUtils.getDailyEndTime());
-            //执行历史列表
+            // 查询计划组的任务的子计划任务
+            List<String> groupReportIds = list.stream().filter(TaskCenterDTO::isIntegrated).map(TaskCenterDTO::getId).toList();
+            if (CollectionUtils.isNotEmpty(groupReportIds)) {
+                List<TaskCenterDTO> childTaskCenterList = extTestPlanReportMapper.getChildTaskCenter(groupReportIds);
+                Map<String, List<TaskCenterDTO>> childTaskMap = childTaskCenterList.stream().collect(Collectors.groupingBy(TaskCenterDTO::getParentId));
+                list.forEach(item -> {
+                    if (CollectionUtils.isNotEmpty(childTaskMap.get(item.getId()))) {
+                        item.setChildren(childTaskMap.get(item.getId()));
+                    }
+                });
+            }
+
+            // 执行历史列表
             List<String> reportIds = list.stream().map(TaskCenterDTO::getId).toList();
             if (CollectionUtils.isNotEmpty(reportIds)) {
                 List<ExecuteReportDTO> historyDeletedList = extTestPlanReportMapper.getHistoryDeleted(reportIds);
                 historyDeletedMap = historyDeletedList.stream().collect(Collectors.toMap(ExecuteReportDTO::getId, Function.identity()));
             }
-            processTaskCenter(list, projectList, projectIds, historyDeletedMap);
-        }
 
-        return list;
-    }
-
-    private void processTaskCenter(List<TaskCenterDTO> list, List<OptionDTO> projectList, List<String> projectIds, Map<String, ExecuteReportDTO> historyDeletedMap) {
-        if (!list.isEmpty()) {
-            // 取所有的userid
+            // 准备参数
             Set<String> userSet = list.stream()
                     .flatMap(item -> Stream.of(item.getOperationName()))
                     .collect(Collectors.toSet());
@@ -156,12 +158,22 @@ public class TestPlanTaskCenterService {
             // 组织
             List<OptionDTO> orgListByProjectList = getOrgListByProjectIds(projectIds);
             Map<String, String> orgMap = orgListByProjectList.stream().collect(Collectors.toMap(OptionDTO::getId, OptionDTO::getName));
+            processTaskCenter(list, userMap, projectMap, orgMap, historyDeletedMap);
+        }
 
+        return list;
+    }
+
+    private void processTaskCenter(List<TaskCenterDTO> list, Map<String, String> userMap, Map<String, String> projectMap, Map<String, String> orgMap, Map<String, ExecuteReportDTO> historyDeletedMap) {
+        if (!list.isEmpty()) {
             list.forEach(item -> {
                 item.setOperationName(userMap.getOrDefault(item.getOperationName(), StringUtils.EMPTY));
                 item.setProjectName(projectMap.getOrDefault(item.getProjectId(), StringUtils.EMPTY));
                 item.setOrganizationName(orgMap.getOrDefault(item.getProjectId(), StringUtils.EMPTY));
                 item.setHistoryDeleted(MapUtils.isNotEmpty(historyDeletedMap) && !historyDeletedMap.containsKey(item.getId()));
+                if (CollectionUtils.isNotEmpty(item.getChildren())) {
+                    processTaskCenter(item.getChildren(), userMap, projectMap, orgMap, historyDeletedMap);
+                }
             });
         }
     }
diff --git a/backend/services/test-plan/src/test/java/io/metersphere/plan/controller/TestPlanTaskCenterControllerTests.java b/backend/services/test-plan/src/test/java/io/metersphere/plan/controller/TestPlanTaskCenterControllerTests.java
index 6f68704c41..fd868b39e9 100644
--- a/backend/services/test-plan/src/test/java/io/metersphere/plan/controller/TestPlanTaskCenterControllerTests.java
+++ b/backend/services/test-plan/src/test/java/io/metersphere/plan/controller/TestPlanTaskCenterControllerTests.java
@@ -10,8 +10,6 @@ import io.metersphere.plan.domain.TestPlanReportApiCase;
 import io.metersphere.plan.domain.TestPlanReportApiScenario;
 import io.metersphere.plan.mapper.TestPlanReportApiCaseMapper;
 import io.metersphere.plan.mapper.TestPlanReportApiScenarioMapper;
-import io.metersphere.project.mapper.ProjectApplicationMapper;
-import io.metersphere.project.mapper.ProjectTestResourcePoolMapper;
 import io.metersphere.sdk.constants.ExecStatus;
 import io.metersphere.sdk.constants.SessionConstants;
 import io.metersphere.sdk.constants.TaskCenterResourceType;
@@ -23,8 +21,6 @@ import io.metersphere.system.dto.sdk.BaseCondition;
 import io.metersphere.system.dto.table.TableBatchProcessDTO;
 import io.metersphere.system.dto.taskcenter.request.TaskCenterBatchRequest;
 import io.metersphere.system.dto.taskcenter.request.TaskCenterPageRequest;
-import io.metersphere.system.mapper.TestResourcePoolBlobMapper;
-import io.metersphere.system.mapper.TestResourcePoolMapper;
 import io.metersphere.system.utils.Pager;
 import jakarta.annotation.Resource;
 import org.junit.jupiter.api.*;
@@ -68,14 +64,6 @@ public class TestPlanTaskCenterControllerTests extends BaseTest {
     @Resource
     private ApiScenarioReportService apiScenarioReportService;
     @Resource
-    private TestResourcePoolMapper testResourcePoolMapper;
-    @Resource
-    private TestResourcePoolBlobMapper testResourcePoolBlobMapper;
-    @Resource
-    private ProjectTestResourcePoolMapper projectTestResourcePoolMapper;
-    @Resource
-    private ProjectApplicationMapper projectApplicationMapper;
-    @Resource
     private TestPlanReportApiCaseMapper testPlanReportApiCaseMapper;
     @Resource
     private TestPlanReportApiScenarioMapper testPlanReportApiScenarioMapper;
diff --git a/backend/services/test-plan/src/test/resources/dml/init_task_plan.sql b/backend/services/test-plan/src/test/resources/dml/init_task_plan.sql
index 763dbdcacf..000c3d4400 100644
--- a/backend/services/test-plan/src/test/resources/dml/init_task_plan.sql
+++ b/backend/services/test-plan/src/test/resources/dml/init_task_plan.sql
@@ -9,6 +9,8 @@ VALUES
 ('test-plan-report-id-3', 'test_plan_id_1', '测试一下计划报告3', 'admin', UNIX_TIMESTAMP()*1000, UNIX_TIMESTAMP()*1000, UNIX_TIMESTAMP()*1000, 'MANUAL', 'RUNNING', '-', '99.99', 100.00, '100001100001',1, 0, null, '测试一下计划'),
 ('test-plan-report-id-4', 'test_plan_id_1', '测试一下计划报告4', 'admin', UNIX_TIMESTAMP()*1000, UNIX_TIMESTAMP()*1000, UNIX_TIMESTAMP()*1000, 'MANUAL', 'RUNNING', '-', '99.99', 100.00, '100001100001', 1, 0, null, '测试一下计划'),
 ('test-plan-report-id-1-1', 'test_plan_id_1', '测试一下计划报告1-1', 'admin', UNIX_TIMESTAMP()*1000, UNIX_TIMESTAMP()*1000, UNIX_TIMESTAMP()*1000, 'MANUAL', 'RUNNING', '-', '99.99', 100.00, '100001100001', 1, 0, 'test-plan-report-id-1', '测试一下计划'),
-('test-plan-report-id-1-2', 'test_plan_id_1', '测试一下计划报告1-2', 'admin', UNIX_TIMESTAMP()*1000, UNIX_TIMESTAMP()*1000, UNIX_TIMESTAMP()*1000, 'MANUAL', 'RUNNING', '-', '99.99', 100.00, '100001100001', 1, 0, 'test-plan-report-id-1', '测试一下计划');
+('test-plan-report-id-1-2', 'test_plan_id_1', '测试一下计划报告1-2', 'admin', UNIX_TIMESTAMP()*1000, UNIX_TIMESTAMP()*1000, UNIX_TIMESTAMP()*1000, 'MANUAL', 'RUNNING', '-', '99.99', 100.00, '100001100001', 1, 0, 'test-plan-report-id-1-2', '测试一下计划'),
+('test-plan-report-id-1-3', 'test_plan_id_1', '测试一下计划报告1-3', 'admin', UNIX_TIMESTAMP()*1000, UNIX_TIMESTAMP()*1000, UNIX_TIMESTAMP()*1000, 'MANUAL', 'RUNNING', '-', '99.99', 100.00, '100001100001', 0, 0, 'test-plan-report-id-1-2', '测试一下计划'),
+('test-plan-report-id-1-4', 'test_plan_id_1', '测试一下计划报告1-4', 'admin', UNIX_TIMESTAMP()*1000, UNIX_TIMESTAMP()*1000, UNIX_TIMESTAMP()*1000, 'MANUAL', 'RUNNING', '-', '99.99', 100.00, '100001100001', 1, 0, 'test-plan-report-id-1-4', '测试一下计划');