From 382e3663996622050eb54e2b14b1b112dde5b433 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Thu, 11 May 2023 16:32:47 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E7=9A=84=E5=AE=8C=E6=88=90=E7=8E=87=E4=B8=BA=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E5=AE=8C=E6=88=90=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改测试计划报告的完成率为执行完成率
---
 .../main/java/io/metersphere/commons/utils/TestPlanUtils.java | 4 ++--
 .../view/comonents/report/detail/TestPlanOverviewReport.vue   | 2 +-
 frontend/src/i18n/en-US.js                                    | 1 +
 frontend/src/i18n/zh-CN.js                                    | 1 +
 frontend/src/i18n/zh-TW.js                                    | 1 +
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/commons/utils/TestPlanUtils.java b/backend/src/main/java/io/metersphere/commons/utils/TestPlanUtils.java
index 65f12ec39e51..004222aa3d21 100644
--- a/backend/src/main/java/io/metersphere/commons/utils/TestPlanUtils.java
+++ b/backend/src/main/java/io/metersphere/commons/utils/TestPlanUtils.java
@@ -67,8 +67,8 @@ public static void buildStatusResultMap(List<PlanReportCaseDTO> planReportCaseDT
             report.setCaseCount((report.getCaseCount() == null ? 0 : report.getCaseCount()) + 1);
             String status = item.getStatus();
             if (StringUtils.isNotBlank(status)
-                    && !StringUtils.equalsAnyIgnoreCase(status, TestPlanTestCaseStatus.Underway.name(), TestPlanTestCaseStatus.Prepare.name(),
-                    ExecuteResult.UN_EXECUTE.toString(), ExecuteResult.STOP.toString(), ExecuteResult.WAITING.toString())) {
+                    && !StringUtils.equalsAnyIgnoreCase(status, TestPlanTestCaseStatus.Underway.name(), TestPlanTestCaseStatus.Prepare.name(),TestPlanTestCaseStatus.Blocking.name(),
+                    ExecuteResult.UN_EXECUTE.toString(), ExecuteResult.STOP.toString(), ExecuteResult.WAITING.toString(), ExecuteResult.TEST_PLAN_PREPARE.toString(), ExecuteResult.TEST_PLAN_RUNNING.toString())) {
                 // 计算执行过的数量
                 report.setExecuteCount(report.getExecuteCount() + 1);
                 if (StringUtils.equals(successStatus, status)) {
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanOverviewReport.vue b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanOverviewReport.vue
index f5c3e2951708..5ea9ae2c4389 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanOverviewReport.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanOverviewReport.vue
@@ -11,7 +11,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item :label="$t('test_track.report.exacutive_rate') + ':'">
+          <el-form-item :label="$t('test_track.report.executive_finish_rate') + ':'">
             {{ (report.executeRate ? (report.executeRate * 100).toFixed(1) : 0) + '%'}}
             <ms-instructions-icon :content="$t('test_track.report.exacutive_rate_tip')"/>
           </el-form-item>
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index a643400acc9e..f4b997376d10 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -2503,6 +2503,7 @@ export default {
       testing_time: "Testing time",
       total_number_tests: "Total",
       exacutive_rate: "Exacutive rate",
+      executive_finish_rate: "Executive finish rate",
       exacutive_rate_tip: "Use cases executed/all use cases * 100%",
       passing_rate: "Passing rate",
       passing_rate_tip: "Execute passed use cases/all use cases * 100%",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index f68acb5508ef..afb567b4a38d 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -2509,6 +2509,7 @@ export default {
       testing_time: "测试时间",
       total_number_tests: "测试总数",
       exacutive_rate: "执行率",
+      executive_finish_rate: "执行完成率",
       exacutive_rate_tip: "执行过的用例/所有用例 * 100%",
       passing_rate: "通过率",
       passing_rate_tip: "执行通过用例/所有用例 * 100%",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 1b30a9002b27..9a83eec17245 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -2505,6 +2505,7 @@ export default {
       testing_time: "測試時間",
       total_number_tests: "測試總數",
       exacutive_rate: "執行率",
+      executive_finish_rate: "執行完成率",
       exacutive_rate_tip: "執行過的用例/所有用例 * 100%",
       passing_rate: "通過率",
       passing_rate_tip: "執行通過用例/所有用例 * 100%",