From bf34c5d21e65d0d1e988410aec056c88612b2c9a Mon Sep 17 00:00:00 2001
From: WangXu10 <xu.wang@fit2cloud.com>
Date: Wed, 20 Nov 2024 11:25:19 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=BB=E5=8A=A1=E4=B8=AD=E5=BF=83):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=81=9C=E6=AD=A2=E4=BB=BB=E5=8A=A1=EF=BC=8C?=
 =?UTF-8?q?=E6=9C=AA=E6=89=A7=E8=A1=8C=E4=BB=BB=E5=8A=A1=E9=A1=B9=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=B2=A1=E6=9C=89=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1049101 --user=王旭 【任务中心】-手动停止执行中的任务，任务详情中未执行的用例和场景的执行状态没有更新为已停止 https://www.tapd.cn/55049933/s/1612863
---
 .../system/mapper/ExtExecTaskItemMapper.xml        |  4 ++--
 .../system/mapper/ExtExecTaskMapper.java           |  3 +++
 .../system/mapper/ExtExecTaskMapper.xml            | 14 ++++++++++++++
 .../system/service/BaseTaskHubService.java         |  2 +-
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtExecTaskItemMapper.xml b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtExecTaskItemMapper.xml
index 87d94fe025..615906521f 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtExecTaskItemMapper.xml
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtExecTaskItemMapper.xml
@@ -194,7 +194,7 @@
         <if test="organizationId != null and organizationId != ''">
             and organization_id = #{organizationId}
         </if>
-        and `status` = 'RUNNING'
+        and `status` in ('RUNNING', 'PENDING')
         and deleted = false
     </update>
 
@@ -236,7 +236,7 @@
         <if test="organizationId != null and organizationId != ''">
             and organization_id = #{organizationId}
         </if>
-        and `status` = 'RUNNING'
+        and `status` in ('RUNNING', 'PENDING')
     </update>
 
     <select id="getResourcePoolsByItemIds" resultType="io.metersphere.system.domain.ExecTaskItem">
diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtExecTaskMapper.java b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtExecTaskMapper.java
index b03c743e1b..d79a7a82bd 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtExecTaskMapper.java
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtExecTaskMapper.java
@@ -23,6 +23,7 @@ public interface ExtExecTaskMapper {
 
     /**
      * 查询时间范围内的任务ID集合
+     *
      * @param timeMills 时间戳
      * @param projectId 项目ID
      * @return 任务ID列表
@@ -30,4 +31,6 @@ public interface ExtExecTaskMapper {
     List<String> getTaskIdsByTime(@Param("timeMills") long timeMills, @Param("projectId") String projectId);
 
     List<ExecTaskItemDetailDTO> selectTypeByItemId(@Param("itemId") String itemId);
+
+    List<String> getSelectIds(@Param("ids") List<String> ids, @Param("flag") boolean flag);
 }
diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtExecTaskMapper.xml b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtExecTaskMapper.xml
index c2b868bde2..0609512ed3 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtExecTaskMapper.xml
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtExecTaskMapper.xml
@@ -149,4 +149,18 @@
                 exec_task_item.task_origin as taskOrigin
                from exec_task inner join exec_task_item on exec_task.id = exec_task_item.task_id where exec_task_item.id = #{itemId}
     </select>
+
+    <select id="getSelectIds" resultType="java.lang.String">
+        select id from exec_task
+        where deleted = false
+        <if test="flag">
+            and status = 'RUNNING'
+        </if>
+        <if test="ids != null and ids.size() > 0">
+            and id in
+            <foreach collection="ids" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTaskHubService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTaskHubService.java
index 48566c8afd..50dad4b94d 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTaskHubService.java
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTaskHubService.java
@@ -692,7 +692,7 @@ public class BaseTaskHubService {
             }
             return ids;
         } else {
-            return request.getSelectIds();
+            return extExecTaskMapper.getSelectIds(request.getSelectIds(), flag);
         }
     }