From 5a560037b7f1b2656b461eeb3a0ce448051313ab Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Thu, 18 Aug 2022 17:53:55 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E5=B7=A5=E4=BD=9C=E5=8F=B0):=20?=
 =?UTF-8?q?=E6=88=91=E5=88=9B=E5=BB=BA=E7=9A=84=E6=95=B0=E6=8D=AE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--user=郭雨琦
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001015938
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001015941
---
 .../base/mapper/ext/ExtApiTestCaseMapper.xml  |  4 ++-
 .../service/WorkstationService.java           | 27 ++++++++++++-------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
index 7bc5089f9a..1d7ebd3678 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
@@ -652,8 +652,10 @@
 
     <select id="moduleCount" resultType="java.lang.Integer">
         SELECT count(api_test_case.id) FROM api_test_case
-        left join project on api_test_case.project_id = project.id
+        inner join project on api_test_case.project_id = project.id
+        inner JOIN api_definition a ON api_test_case.api_definition_id = a.id
         <include refid="criCondition"/>
+        and a.latest is not null
     </select>
 
     <select id="getRequest" resultType="io.metersphere.api.dto.definition.ApiTestCaseInfo">
diff --git a/backend/src/main/java/io/metersphere/service/WorkstationService.java b/backend/src/main/java/io/metersphere/service/WorkstationService.java
index 4b600e50d8..d6a740e37c 100644
--- a/backend/src/main/java/io/metersphere/service/WorkstationService.java
+++ b/backend/src/main/java/io/metersphere/service/WorkstationService.java
@@ -13,7 +13,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Service
@@ -40,10 +42,11 @@ public class WorkstationService {
         apiTestCaseRequest.setWorkspaceId(SessionUtils.getCurrentWorkspaceId());
         //@see io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml:103
         Map<String, Object> combine = new HashMap<>(2);
-        Map<String,String>operatorValue = new HashMap<>(2);
-        operatorValue.put("operator","current user");
-        operatorValue.put("value","current user");
-        combine.put("creator",operatorValue);
+        Map<String, String> operatorValue = new HashMap<>(2);
+        operatorValue.put("operator", "current user");
+        operatorValue.put("value", "current user");
+        combine.put("creator", operatorValue);
+        Map<String, List<String>> filter = new HashMap<>(2);
         testPlanRequest.setCombine(combine);
         apiTestCaseRequest.setCombine(combine);
         ApiScenarioRequest apiScenarioRequest = new ApiScenarioRequest();
@@ -52,17 +55,23 @@ public class WorkstationService {
         QueryTestCaseRequest testCaseRequest = new QueryTestCaseRequest();
         testCaseRequest.setWorkspaceId(SessionUtils.getCurrentWorkspaceId());
         testCaseRequest.setCombine(combine);
+        List<String> status = new ArrayList<>();
+        status.add("Prepare");
+        status.add("Pass");
+        status.add("UnPass");
+        filter.put("reviewStatus", status);
+        testCaseRequest.setFilters(filter);
         //query db
         int apiScenarioCaseCount = extApiScenarioMapper.listModule(apiScenarioRequest);
         int apiTestCaseCount = extApiTestCaseMapper.moduleCount(apiTestCaseRequest);
         int testCaseCount = extTestCaseMapper.moduleCount(testCaseRequest);
         int loadTestCount = extLoadTestMapper.moduleCount(testPlanRequest);
         //build result
-        Map<String, Integer>map = new HashMap<>(4);
-        map.put("apiScenarioCaseCount",apiScenarioCaseCount);
-        map.put("apiTestCaseCount",apiTestCaseCount);
-        map.put("testCaseCount",testCaseCount);
-        map.put("loadTestCount",loadTestCount);
+        Map<String, Integer> map = new HashMap<>(4);
+        map.put("apiScenarioCaseCount", apiScenarioCaseCount);
+        map.put("apiTestCaseCount", apiTestCaseCount);
+        map.put("testCaseCount", testCaseCount);
+        map.put("loadTestCount", loadTestCount);
         return map;
 
     }