From 25ddb595275b3cda8095b0b0e91dd2b93606efba Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 7 Jul 2021 15:48:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E7=BC=BA=E9=99=B7=E5=88=97=E8=A1=A8=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=B2=A1=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtIssuesMapper.xml       |  4 +++-
 .../track/issue/ZentaoPlatform.java           |  7 ++----
 .../track/case/components/IssueRelateList.vue | 12 +++++++++-
 .../case/components/TestCaseIssueRelate.vue   | 24 ++++++++++++++++++-
 .../components/track/issue/IssueList.vue      |  5 +++-
 frontend/src/i18n/en-US.js                    |  1 +
 frontend/src/i18n/zh-CN.js                    |  1 +
 frontend/src/i18n/zh-TW.js                    |  1 +
 8 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
index 160132fb68..0983f88adf 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
@@ -18,6 +18,7 @@
                issues.lastmodify
         from issues
         <include refid="queryWhereCondition"/>
+        and (issues.platform_status != 'delete' or issues.platform_status is NULL)
         <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.orders"/>
     </select>
     <select id="getNextNum" resultType="io.metersphere.base.domain.Issues">
@@ -25,13 +26,14 @@
     </select>
     <select id="getRelateIssues" resultType="io.metersphere.base.domain.IssuesDao">
         select issues.id, issues.num, issues.title, issues.project_id, issues.create_time, issues.update_time,
-        issues.description, issues.status, issues.platform, issues.custom_fields,test_case_issues.test_case_id,
+        issues.description, issues.status, issues.platform, issues.custom_fields,test_case_issues.test_case_id,issues.platform_status,
         issues.lastmodify
         from issues
         left join
         test_case_issues on issues.id = test_case_issues.issues_id
         <include refid="queryWhereCondition"/>
         and (test_case_issues.test_case_id is null or test_case_issues.test_case_id != #{request.caseId})
+        and (issues.platform_status != 'delete' or issues.platform_status is NULL)
         <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.orders"/>
     </select>
     <select id="getIssueForSync" resultType="io.metersphere.base.domain.IssuesDao">
diff --git a/backend/src/main/java/io/metersphere/track/issue/ZentaoPlatform.java b/backend/src/main/java/io/metersphere/track/issue/ZentaoPlatform.java
index 0b0a5049da..2b2dfd9f1f 100644
--- a/backend/src/main/java/io/metersphere/track/issue/ZentaoPlatform.java
+++ b/backend/src/main/java/io/metersphere/track/issue/ZentaoPlatform.java
@@ -4,10 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
-import io.metersphere.base.domain.IssuesDao;
-import io.metersphere.base.domain.IssuesExample;
-import io.metersphere.base.domain.Project;
-import io.metersphere.base.domain.TestCaseWithBLOBs;
+import io.metersphere.base.domain.*;
 import io.metersphere.commons.constants.IssuesManagePlatform;
 import io.metersphere.commons.constants.IssuesStatus;
 import io.metersphere.commons.exception.MSException;
@@ -143,13 +140,13 @@ public class ZentaoPlatform extends AbstractIssuePlatform {
         }
         IssuesDao issues = new IssuesDao();
         issues.setId(bug.getId());
+        issues.setPlatformStatus(bug.getStatus());
         if (StringUtils.equals(bug.getDeleted(),"1")) {
             issues.setPlatformStatus(IssuesStatus.DELETE.toString());
             issuesMapper.updateByPrimaryKeySelective(issues);
         }
         issues.setTitle(bug.getTitle());
         issues.setDescription(steps);
-        issues.setPlatformStatus(bug.getStatus());
         issues.setReporter(bug.getOpenedBy());
         return issues;
     }
diff --git a/frontend/src/business/components/track/case/components/IssueRelateList.vue b/frontend/src/business/components/track/case/components/IssueRelateList.vue
index 1a34c0f808..9e4f446ede 100644
--- a/frontend/src/business/components/track/case/components/IssueRelateList.vue
+++ b/frontend/src/business/components/track/case/components/IssueRelateList.vue
@@ -31,6 +31,16 @@
       </ms-table-column>
 
       <ms-table-column
+        :label="$t('test_track.issue.platform_status')"
+        v-if="isThirdPart"
+        prop="platformStatus">
+        <template v-slot="scope">
+          {{ scope.row.platformStatus ? scope.row.platformStatus : '--'}}
+        </template>
+      </ms-table-column>
+
+      <ms-table-column
+        v-else
         :label="$t('test_track.issue.status')"
         prop="status">
         <template v-slot="scope">
@@ -79,7 +89,7 @@ export default {
       return getCurrentProjectID();
     }
   },
-  props: ['caseId'],
+  props: ['caseId', 'isThirdPart'],
   methods: {
     open() {
       this.getIssues();
diff --git a/frontend/src/business/components/track/case/components/TestCaseIssueRelate.vue b/frontend/src/business/components/track/case/components/TestCaseIssueRelate.vue
index 6b35bf3305..9597031eb7 100644
--- a/frontend/src/business/components/track/case/components/TestCaseIssueRelate.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseIssueRelate.vue
@@ -30,6 +30,16 @@
       </ms-table-column>
 
       <ms-table-column
+        :label="$t('test_track.issue.platform_status')"
+        v-if="isThirdPart"
+        prop="platformStatus">
+        <template v-slot="scope">
+          {{ scope.row.platformStatus ? scope.row.platformStatus : '--'}}
+        </template>
+      </ms-table-column>
+
+      <ms-table-column
+        v-else
         :label="$t('test_track.issue.status')"
         prop="status">
         <template v-slot="scope">
@@ -66,7 +76,7 @@
     </ms-table>
 
     <test-plan-issue-edit :plan-id="planId" :case-id="caseId" @refresh="getIssues" ref="issueEdit"/>
-    <IssueRelateList :case-id="caseId"  @refresh="getIssues" ref="issueRelate"/>
+    <IssueRelateList :is-third-part="isThirdPart" :case-id="caseId"  @refresh="getIssues" ref="issueRelate"/>
   </div>
 </template>
 
@@ -78,6 +88,7 @@ import IssueDescriptionTableItem from "@/business/components/track/issue/IssueDe
 import {ISSUE_STATUS_MAP} from "@/common/js/table-constants";
 import IssueRelateList from "@/business/components/track/case/components/IssueRelateList";
 import {getIssuesByCaseId} from "@/network/Issue";
+import {getIssueTemplate} from "@/network/custom-field-template";
 export default {
   name: "TestCaseIssueRelate",
   components: {IssueRelateList, IssueDescriptionTableItem, MsTableColumn, MsTable, TestPlanIssueEdit},
@@ -87,6 +98,7 @@ export default {
         data: [],
         result: {},
       },
+      isThirdPart: false
     }
   },
   props: ['caseId', 'readOnly','planId'],
@@ -95,6 +107,16 @@ export default {
       return ISSUE_STATUS_MAP;
     },
   },
+  created() {
+    getIssueTemplate()
+      .then((template) => {
+        if (template.platform === 'metersphere') {
+          this.isThirdPart = false;
+        } else {
+          this.isThirdPart = true;
+        }
+      });
+  },
   methods: {
     getIssues() {
       let result = getIssuesByCaseId(this.caseId, this.page);
diff --git a/frontend/src/business/components/track/issue/IssueList.vue b/frontend/src/business/components/track/issue/IssueList.vue
index ea742c7f06..2a3cb8c1a1 100644
--- a/frontend/src/business/components/track/issue/IssueList.vue
+++ b/frontend/src/business/components/track/issue/IssueList.vue
@@ -69,8 +69,11 @@
           <ms-table-column
                   :field="item"
                   :fields-width="fieldsWidth"
-                  :label="$t('test_track.issue.status')"
+                  :label="$t('test_track.issue.platform_status') "
                   prop="platformStatus">
+            <template v-slot="scope">
+              {{ scope.row.platformStatus ? scope.row.platformStatus : '--'}}
+            </template>
           </ms-table-column>
 
           <ms-table-column
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index cbd836345c..87e1e2cf49 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -1618,6 +1618,7 @@ export default {
     issue: {
       issue: "Issue",
       issue_management: "Issue Management",
+      platform_status: "Platform Status",
       issue_resource: "Issue source",
       create_issue: "Create Issue",
       add_issue: "Add Issue",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index b1c901cb22..13ad41ec95 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -1622,6 +1622,7 @@ export default {
     issue: {
       issue: "缺陷",
       issue_management: "缺陷管理",
+      platform_status: "平台状态",
       issue_resource: "缺陷来源",
       create_issue: "创建缺陷",
       add_issue: "添加缺陷",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 5c37fdad16..ac88f34752 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -1622,6 +1622,7 @@ export default {
     issue: {
       issue: "缺陷",
       issue_management: "缺陷管理",
+      platform_status: "平臺狀態",
       issue_resource: "缺陷來源",
       create_issue: "創建缺陷",
       add_issue: "添加缺陷",