From 74827189bcd218cd2502cb58ba4a973dfc2d8974 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 27 May 2020 12:25:02 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=88=A0=E9=99=A4=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../metersphere/track/service/TestCaseService.java |  7 +++++++
 .../metersphere/track/service/TestPlanService.java | 14 ++++++++------
 .../src/business/components/project/MsProject.vue  | 14 ++++++++++++++
 frontend/src/i18n/en-US.js                         |  2 +-
 frontend/src/i18n/zh-CN.js                         |  2 +-
 frontend/src/i18n/zh-TW.js                         |  2 +-
 6 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
index 263d0aced4..1edf70ce46 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
@@ -285,11 +285,18 @@ public class TestCaseService {
     }
 
     public void deleteTestCaseBath(TestCaseBatchRequest request) {
+        deleteTestPlanTestCaseBath(request.getIds());
         TestCaseExample example = new TestCaseExample();
         example.createCriteria().andIdIn(request.getIds());
         testCaseMapper.deleteByExample(example);
     }
 
+    public void deleteTestPlanTestCaseBath(List<String> caseIds) {
+        TestPlanTestCaseExample example = new TestPlanTestCaseExample();
+        example.createCriteria().andCaseIdIn(caseIds);
+        testPlanTestCaseMapper.deleteByExample(example);
+    }
+
     public void deleteTestCaseByProjectId(String projectId) {
         TestCaseExample example = new TestCaseExample();
         example.createCriteria().andProjectIdEqualTo(projectId);
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
index 12c00e91ff..2a92a3d023 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
@@ -33,6 +33,7 @@ import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -92,14 +93,15 @@ public class TestPlanService {
         return testPlanMapper.updateByPrimaryKeySelective(testPlan);
     }
 
-    public int deleteTestPlan(String testPlanId) {
+    public int deleteTestPlan(String planId) {
+        deleteTestCaseByPlanId(planId);
+        return testPlanMapper.deleteByPrimaryKey(planId);
+    }
+
+    public void deleteTestCaseByPlanId(String testPlanId) {
         TestPlanTestCaseExample testPlanTestCaseExample = new TestPlanTestCaseExample();
         testPlanTestCaseExample.createCriteria().andPlanIdEqualTo(testPlanId);
-        List<TestPlanTestCase> testPlanTestCases = testPlanTestCaseMapper.selectByExample(testPlanTestCaseExample);
-        if (testPlanTestCases.size() > 0) {
-            MSException.throwException(Translator.get("before_delete_plan"));
-        }
-        return testPlanMapper.deleteByPrimaryKey(testPlanId);
+        testPlanTestCaseMapper.deleteByExample(testPlanTestCaseExample);
     }
 
     public List<TestPlanDTO> listTestPlan(QueryTestPlanRequest request) {
diff --git a/frontend/src/business/components/project/MsProject.vue b/frontend/src/business/components/project/MsProject.vue
index f5ceb84058..42ee94fc9e 100644
--- a/frontend/src/business/components/project/MsProject.vue
+++ b/frontend/src/business/components/project/MsProject.vue
@@ -10,6 +10,20 @@
           <el-table-column prop="name" :label="$t('commons.name')"/>
           <el-table-column prop="description" :label="$t('commons.description')"/>
           <!--<el-table-column prop="workspaceName" :label="$t('project.owning_workspace')"/>-->
+          <el-table-column
+            :label="$t('commons.create_time')"
+            show-overflow-tooltip>
+            <template v-slot:default="scope">
+              <span>{{ scope.row.createTime | timestampFormatDate }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            :label="$t('commons.update_time')"
+            show-overflow-tooltip>
+            <template v-slot:default="scope">
+              <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
+            </template>
+          </el-table-column>
           <el-table-column>
             <template v-slot:default="scope">
               <ms-table-operator @editClick="edit(scope.row)" @deleteClick="del(scope.row)"/>
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 153fab241f..67b674da28 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -428,7 +428,7 @@ export default {
       plan_status_prepare: "Not started",
       plan_status_running: "Starting",
       plan_status_completed: "Completed",
-      plan_delete_confirm: "Confirm delete test plan: ",
+      plan_delete_confirm: "All use cases under this plan will be deleted,confirm delete test plan: ",
     },
     module: {
       search: "Search module",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 7b6fca86a9..8c57feb1e6 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -425,7 +425,7 @@ export default {
       plan_status_prepare: "未开始",
       plan_status_running: "进行中",
       plan_status_completed: "已完成",
-      plan_delete_confirm: "确认删除测试计划: ",
+      plan_delete_confirm: "将删除该测试计划下所有用例，确认删除测试计划: ",
     },
     module: {
       search: "搜索模块",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 28b1b35124..e99bb5baf3 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -427,7 +427,7 @@ export default {
       plan_status_prepare: "未開始",
       plan_status_running: "進行中",
       plan_status_completed: "已完成",
-      plan_delete_confirm: "確認刪除測試計劃: ",
+      plan_delete_confirm: "將刪除該測試計劃下所有用例，確認刪除測試計劃: ",
     },
     module: {
       search: "搜索模塊",