From 481336a51893bd56b72d55b514360026c67fdb3c Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Mon, 18 Nov 2024 18:15:23 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E5=B7=A5=E4=BD=9C=E5=8F=B0):=20?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E7=BB=9F=E8=AE=A1=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E6=97=B6=E9=97=B4=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plan/controller/TestPlanController.java           |  2 +-
 .../io/metersphere/plan/mapper/ExtTestPlanMapper.java |  2 +-
 .../io/metersphere/plan/mapper/ExtTestPlanMapper.xml  |  4 +++-
 .../io/metersphere/plan/service/TestPlanService.java  | 11 +++--------
 .../io/metersphere/plan/controller/TestPlanTests.java |  8 --------
 5 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/controller/TestPlanController.java b/backend/services/test-plan/src/main/java/io/metersphere/plan/controller/TestPlanController.java
index 611c70bd90..ca28aa3344 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/controller/TestPlanController.java
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/controller/TestPlanController.java
@@ -74,7 +74,7 @@ public class TestPlanController {
             testPlanCoverageDTO.setErrorCode(109001);
             return testPlanCoverageDTO;
         }
-        return testPlanService.rageByProjectIdAndTimestamp(request.getProjectId(), request.getStartTime(), request.getEndTime());
+        return testPlanService.rageByProjectIdAndTimestamp(request.getProjectId());
     }
 
     @GetMapping("/group-list/{projectId}")
diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanMapper.java b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanMapper.java
index b6688d653d..cd86ac857d 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanMapper.java
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanMapper.java
@@ -94,5 +94,5 @@ public interface ExtTestPlanMapper {
      */
     List<SelectOption> getPlanBugList(@Param("projectId") String projectId, @Param("type") String type, @Param("platforms") List<String> platform, @Param("statusList") List<String> statusList);
 
-    List<TestPlan> selectIdAndStatusByProjectIdAndCreateTimeRangeAndType(@Param("projectId") String projectId, @Param("startTime") long startTime, @Param("endTime") long endTime, @Param("type") String testPlanTypePlan);
+    List<TestPlan> selectIdAndStatusByProjectIdAndCreateTimeRangeAndType(@Param("projectId") String projectId, @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("type") String testPlanTypePlan);
 }
diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanMapper.xml b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanMapper.xml
index 946b88f1e2..a0c9ff08c5 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanMapper.xml
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanMapper.xml
@@ -872,7 +872,9 @@
         SELECT id, status
         FROM test_plan
         WHERE project_id = #{projectId}
-          AND create_time BETWEEN #{startTime} AND #{endTime}
+        <if test="startTime != null and endTime != null">
+            AND create_time BETWEEN #{startTime} AND #{endTime}
+        </if>
           AND type = #{type}
     </select>
     <select id="getPlanBugList" resultType="io.metersphere.plugin.platform.dto.SelectOption">
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 521105532a..631ac55b9a 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
@@ -1005,11 +1005,11 @@ public class TestPlanService extends TestPlanBaseUtilsService {
         }
     }
 
-    public TestPlanCoverageDTO rageByProjectIdAndTimestamp(@NotBlank String projectId, long startTime, long endTime) {
+    public TestPlanCoverageDTO rageByProjectIdAndTimestamp(@NotBlank String projectId) {
         TestPlanCoverageDTO returnDTO = new TestPlanCoverageDTO();
         TestPlanExample testPlanExample = new TestPlanExample();
-        testPlanExample.createCriteria().andProjectIdEqualTo(projectId).andCreateTimeBetween(startTime, endTime).andTypeEqualTo(TestPlanConstants.TEST_PLAN_TYPE_PLAN);
-        List<TestPlan> testPlanList = extTestPlanMapper.selectIdAndStatusByProjectIdAndCreateTimeRangeAndType(projectId, startTime, endTime, TestPlanConstants.TEST_PLAN_TYPE_PLAN);
+        testPlanExample.createCriteria().andProjectIdEqualTo(projectId).andTypeEqualTo(TestPlanConstants.TEST_PLAN_TYPE_PLAN);
+        List<TestPlan> testPlanList = extTestPlanMapper.selectIdAndStatusByProjectIdAndCreateTimeRangeAndType(projectId, null, null, TestPlanConstants.TEST_PLAN_TYPE_PLAN);
 
         List<String> notArchivedList = new ArrayList<>();
         testPlanList.forEach(item -> {
@@ -1025,11 +1025,6 @@ public class TestPlanService extends TestPlanBaseUtilsService {
 
         // 批量处理
         SubListUtils.dealForSubList(notArchivedList, SubListUtils.DEFAULT_BATCH_SIZE, dealList -> {
-            TestPlanConfigExample testPlanConfigExample = new TestPlanConfigExample();
-            testPlanConfigExample.createCriteria().andTestPlanIdIn(dealList);
-            List<TestPlanConfig> testPlanConfigList = testPlanConfigMapper.selectByExample(testPlanConfigExample);
-            Map<String, TestPlanConfig> testPlanConfigMap = testPlanConfigList.stream().collect(Collectors.toMap(TestPlanConfig::getTestPlanId, v -> v));
-
 
             List<TestPlanResourceExecResultDTO> execResults = new ArrayList<>();
             beansOfType.forEach((k, v) -> execResults.addAll(v.selectDistinctLastExecResultByTestPlanIds(dealList)));
diff --git a/backend/services/test-plan/src/test/java/io/metersphere/plan/controller/TestPlanTests.java b/backend/services/test-plan/src/test/java/io/metersphere/plan/controller/TestPlanTests.java
index ba5593245a..8b1221d465 100644
--- a/backend/services/test-plan/src/test/java/io/metersphere/plan/controller/TestPlanTests.java
+++ b/backend/services/test-plan/src/test/java/io/metersphere/plan/controller/TestPlanTests.java
@@ -1,7 +1,5 @@
 package io.metersphere.plan.controller;
 
-import io.metersphere.api.domain.ApiScenario;
-import io.metersphere.api.domain.ApiTestCase;
 import io.metersphere.functional.domain.FunctionalCase;
 import io.metersphere.functional.mapper.FunctionalCaseMapper;
 import io.metersphere.plan.constants.TestPlanResourceConfig;
@@ -102,12 +100,6 @@ public class TestPlanTests extends BaseTest {
 
     private static final List<CheckLogModel> LOG_CHECK_LIST = new ArrayList<>();
 
-    private static final List<FunctionalCase> FUNCTIONAL_CASES = new ArrayList<>();
-
-    private static final List<ApiTestCase> API_TEST_CASES = new ArrayList<>();
-
-    private static final List<ApiScenario> API_SCENARIOS = new ArrayList<>();
-
     //测试计划模块的url
     private static final String URL_GET_MODULE_TREE = "/test-plan/module/tree/%s";
     private static final String URL_GET_MODULE_DELETE = "/test-plan/module/delete/%s";