From 529a9a732d46350e981d4e17cc75f06886ef709d Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Tue, 20 Jun 2023 14:27:58 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=B7=A5=E4=BD=9C=E5=8F=B0):=20=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E8=A2=AB=E7=A7=BB=E9=99=A4=E9=A1=B9=E7=9B=AE=E7=BB=84?=
 =?UTF-8?q?=E4=B9=8B=E5=90=8E=E5=B7=A5=E4=BD=9C=E5=8F=B0=E9=9D=A2=E6=9D=BF?=
 =?UTF-8?q?=E4=B8=8D=E5=86=8D=E7=BB=9F=E8=AE=A1=E5=85=B6=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1027173 --user=宋天阳 【我的工作台】我的仪表盘首页 -我创建的用例-功能用例数量无统计数据
https://www.tapd.cn/55049933/s/1383870；--bug=1027174 --user=宋天阳
【我的工作台】我的关注 tab 页面没有任何统计数据 https://www.tapd.cn/55049933/s/1383869
---
 .../base/mapper/ext/ExtIssuesMapper.xml       |  5 ++-
 .../base/mapper/ext/ExtApiScenarioMapper.xml  |  6 +++
 .../base/mapper/ext/ExtApiTestCaseMapper.xml  |  7 ++-
 .../base/mapper/ext/ExtLoadTestMapper.xml     |  6 +++
 .../base/mapper/ext/ExtTestCaseMapper.xml     |  6 +++
 .../request/api/ApiScenarioRequest.java       |  4 ++
 .../request/api/ApiTestCaseRequest.java       |  3 ++
 .../request/track/QueryTestCaseRequest.java   |  3 ++
 .../request/track/QueryTestPlanRequest.java   |  2 +
 .../service/WorkstationService.java           | 44 +++++++++++++------
 10 files changed, 71 insertions(+), 15 deletions(-)

diff --git a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
index a1e637fa69..2458b79a45 100644
--- a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
+++ b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
@@ -88,7 +88,10 @@
         select count(1) as `count`, if(i.platform = 'Local', cfi.value, i.platform_status) as statusValue, i.platform
         from issues i
                  inner join project p
-                            on i.project_id = p.id and p.workspace_id = #{request.workspaceId}
+                            on i.project_id = p.id and p.workspace_id = #{request.workspaceId} and
+                               p.id IN (SELECT source_id
+                                        FROM user_group
+                                        WHERE user_id = #{request.creator})
                  left join custom_field_issues cfi
                            on i.id = cfi.resource_id and field_id in (select cf.id
                                                                       from custom_field cf
diff --git a/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml b/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
index 8b0c96f230..bc565f8bb2 100644
--- a/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
+++ b/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
@@ -243,6 +243,12 @@
                 AND create_time >= #{request.scheduleCreateTime}
                 )
             </if>
+            <if test="request.projectIdList != null and request.projectIdList.size() > 0">
+                AND project.id in
+                <foreach collection="request.projectIdList" item="itemId" separator="," open="(" close=")">
+                    #{itemId}
+                </foreach>
+            </if>
             <if test="request.ids != null and request.ids.size() > 0">
                 AND api_scenario.id in
                 <foreach collection="request.ids" item="itemId" separator="," open="(" close=")">
diff --git a/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml b/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
index a4c8e7ef56..88860a117d 100644
--- a/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
+++ b/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
@@ -277,7 +277,6 @@
         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 = 1
     </select>
     <select id="getCountFollow" resultType="java.lang.Integer">
         select count(*) from api_test_case ac where
@@ -404,6 +403,12 @@
             <if test="request.createTime >0 ">
                 AND api_test_case.create_time >= #{request.createTime}
             </if>
+            <if test="request.projectIdList != null and request.projectIdList.size() > 0">
+                AND project.id in
+                <foreach collection="request.projectIdList" item="itemId" separator="," open="(" close=")">
+                    #{itemId}
+                </foreach>
+            </if>
         </where>
     </sql>
 
diff --git a/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml b/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
index 548fced832..9b044f98a3 100644
--- a/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
+++ b/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
@@ -151,6 +151,12 @@
                     <property name="objectKey" value="request.combine.tags"/>
                 </include>
             </if>
+            <if test="request.projectIdList != null and request.projectIdList.size() > 0">
+                AND project.id in
+                <foreach collection="request.projectIdList" item="itemId" separator="," open="(" close=")">
+                    #{itemId}
+                </foreach>
+            </if>
             <if test="request.workspaceId != null">
                 AND project.workspace_id = #{request.workspaceId}
             </if>
diff --git a/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml b/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
index ab83427d20..f4dd58bbdd 100644
--- a/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
+++ b/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
@@ -467,6 +467,12 @@
             <if test="request.projectId != null">
                 and test_case.project_id = #{request.projectId}
             </if>
+            <if test="request.projectIdList != null and request.projectIdList.size() > 0">
+                AND project.id in
+                <foreach collection="request.projectIdList" item="itemId" separator="," open="(" close=")">
+                    #{itemId}
+                </foreach>
+            </if>
             <include refid="filters"/>
             <if test="request.caseCoverage == 'uncoverage' ">
                 and test_case.id not in (select distinct test_case_test.test_case_id from test_case_test)
diff --git a/workstation/backend/src/main/java/io/metersphere/request/api/ApiScenarioRequest.java b/workstation/backend/src/main/java/io/metersphere/request/api/ApiScenarioRequest.java
index 47e96c5254..4ede629d9f 100644
--- a/workstation/backend/src/main/java/io/metersphere/request/api/ApiScenarioRequest.java
+++ b/workstation/backend/src/main/java/io/metersphere/request/api/ApiScenarioRequest.java
@@ -4,6 +4,9 @@ import io.metersphere.request.BaseQueryRequest;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Getter
 @Setter
 public class ApiScenarioRequest extends BaseQueryRequest {
@@ -35,4 +38,5 @@ public class ApiScenarioRequest extends BaseQueryRequest {
 
     //测试计划关联场景过滤掉步骤为0的场景
     private String stepTotal;
+    private List<String> projectIdList = new ArrayList<>();
 }
diff --git a/workstation/backend/src/main/java/io/metersphere/request/api/ApiTestCaseRequest.java b/workstation/backend/src/main/java/io/metersphere/request/api/ApiTestCaseRequest.java
index cb58800f58..df5541e5d6 100644
--- a/workstation/backend/src/main/java/io/metersphere/request/api/ApiTestCaseRequest.java
+++ b/workstation/backend/src/main/java/io/metersphere/request/api/ApiTestCaseRequest.java
@@ -5,6 +5,7 @@ import io.metersphere.request.OrderRequest;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -73,4 +74,6 @@ public class ApiTestCaseRequest extends BaseQueryRequest {
 
     //全选
     private boolean selectAll;
+
+    private List<String> projectIdList = new ArrayList<>();
 }
diff --git a/workstation/backend/src/main/java/io/metersphere/request/track/QueryTestCaseRequest.java b/workstation/backend/src/main/java/io/metersphere/request/track/QueryTestCaseRequest.java
index f8cf21f5c2..5e6ad30fad 100644
--- a/workstation/backend/src/main/java/io/metersphere/request/track/QueryTestCaseRequest.java
+++ b/workstation/backend/src/main/java/io/metersphere/request/track/QueryTestCaseRequest.java
@@ -4,6 +4,7 @@ import io.metersphere.request.BaseQueryRequest;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Getter
@@ -63,4 +64,6 @@ public class QueryTestCaseRequest extends BaseQueryRequest {
     private Boolean toBeUpdated;
     private String apiCoverage;
     private String scenarioCoverage;
+
+    private List<String> projectIdList = new ArrayList<>();
 }
diff --git a/workstation/backend/src/main/java/io/metersphere/request/track/QueryTestPlanRequest.java b/workstation/backend/src/main/java/io/metersphere/request/track/QueryTestPlanRequest.java
index 14a72a6a70..c90b10fcef 100644
--- a/workstation/backend/src/main/java/io/metersphere/request/track/QueryTestPlanRequest.java
+++ b/workstation/backend/src/main/java/io/metersphere/request/track/QueryTestPlanRequest.java
@@ -4,6 +4,7 @@ import io.metersphere.request.OrderRequest;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -15,4 +16,5 @@ public class QueryTestPlanRequest extends TestPlanRequest {
     private List<OrderRequest> orders;
     private Map<String, List<String>> filters;
     private Map<String, Object> combine;
+    private List<String> projectIdList = new ArrayList<>();
 }
diff --git a/workstation/backend/src/main/java/io/metersphere/workstation/service/WorkstationService.java b/workstation/backend/src/main/java/io/metersphere/workstation/service/WorkstationService.java
index c69b46d829..579a622a8a 100644
--- a/workstation/backend/src/main/java/io/metersphere/workstation/service/WorkstationService.java
+++ b/workstation/backend/src/main/java/io/metersphere/workstation/service/WorkstationService.java
@@ -12,25 +12,21 @@ import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.request.ApiSyncCaseRequest;
 import io.metersphere.request.ProjectRequest;
 import io.metersphere.request.api.ApiScenarioRequest;
+import io.metersphere.request.api.ApiTestCaseRequest;
 import io.metersphere.request.track.QueryTestCaseRequest;
 import io.metersphere.request.track.QueryTestPlanRequest;
-import io.metersphere.request.api.ApiTestCaseRequest;
+import jakarta.annotation.Resource;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import jakarta.annotation.Resource;
-import java.text.SimpleDateFormat;
 import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.ZoneId;
-import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalField;
 import java.time.temporal.WeekFields;
 import java.util.*;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import static io.metersphere.workstation.util.ShareUtil.getTimeMills;
 
@@ -77,7 +73,7 @@ public class WorkstationService {
             createTime = startDayOfWeek.getTime();
         }
         String userId = SessionUtils.getUserId();
-        //build query condition object
+
         QueryTestPlanRequest testPlanRequest = new QueryTestPlanRequest();
         testPlanRequest.setUserId(userId);
         testPlanRequest.setWorkspaceId(SessionUtils.getCurrentWorkspaceId());
@@ -89,7 +85,7 @@ public class WorkstationService {
         if (isWeek) {
             apiTestCaseRequest.setCreateTime(createTime);
         }
-        //@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");
@@ -109,6 +105,19 @@ public class WorkstationService {
         if (isWeek) {
             testCaseRequest.setCreateTime(createTime);
         }
+
+        ProjectRequest projectRequest = new ProjectRequest();
+        projectRequest.setWorkspaceId(SessionUtils.getCurrentWorkspaceId());
+        projectRequest.setUserId(userId);
+        List<Project> projects = baseProjectMapper.getUserProject(projectRequest);
+        if (CollectionUtils.isNotEmpty(projects)) {
+            List<String> projectIds = projects.stream().map(Project::getId).toList();
+            apiScenarioRequest.setProjectIdList(projectIds);
+            apiTestCaseRequest.setProjectIdList(projectIds);
+            testCaseRequest.setProjectIdList(projectIds);
+            testPlanRequest.setProjectIdList(projectIds);
+        }
+
         //query db
         int apiScenarioCaseCount = extApiScenarioMapper.listModule(apiScenarioRequest);
         int apiTestCaseCount = extApiTestCaseMapper.moduleCount(apiTestCaseRequest);
@@ -124,12 +133,17 @@ public class WorkstationService {
 
     }
 
-    public Map<String, Integer> getFollowTotalCount(String workstationId){
+    public Map<String, Integer> getFollowTotalCount(String workstationId) {
         String userId = SessionUtils.getUserId();
-        List<String> projectIds = extProjectMapper.getProjectIdByWorkspaceId(workstationId);
-        if (CollectionUtils.isEmpty(projectIds)) {
+
+        ProjectRequest projectRequest = new ProjectRequest();
+        projectRequest.setWorkspaceId(workstationId);
+        projectRequest.setUserId(userId);
+        List<Project> projects = baseProjectMapper.getUserProject(projectRequest);
+        if (CollectionUtils.isEmpty(projects)) {
             return null;
         }
+        List<String> projectIds = projects.stream().map(Project::getId).toList();
         int caseFollowCount = extTestCaseMapper.getCountFollow(projectIds, userId);
         int planFollowCount = extTestPlanMapper.getCountFollow(projectIds, userId);
         int reviewFollowCount = extTestCaseReviewMapper.getCountFollow(projectIds, userId);
@@ -246,10 +260,14 @@ public class WorkstationService {
 
     public Integer getIssueWeekCount(String workstationId) {
         String userId = SessionUtils.getUserId();
-        List<String> projectIds = extProjectMapper.getProjectIdByWorkspaceId(workstationId);
-        if (CollectionUtils.isEmpty(projectIds)) {
+        ProjectRequest projectRequest = new ProjectRequest();
+        projectRequest.setWorkspaceId(workstationId);
+        projectRequest.setUserId(userId);
+        List<Project> projects = baseProjectMapper.getUserProject(projectRequest);
+        if (CollectionUtils.isEmpty(projects)) {
             return null;
         }
+        List<String> projectIds = projects.stream().map(Project::getId).toList();
         Date startDayOfWeek = getStartDayOfWeek();
         Long createTime = startDayOfWeek.getTime();
         return extIssuesMapper.getCountCreat(projectIds, userId, createTime);