diff --git a/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml b/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml index 04ef0aca32..cd940cd30f 100644 --- a/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml +++ b/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml @@ -552,7 +552,6 @@ and ad.status in ('Prepare', 'Underway') and ad.user_id = #{userId,jdbcType=VARCHAR} - and ad.latest = 1 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 73c3db66db..a4c8e7ef56 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 @@ -314,14 +314,14 @@ 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 836d5b054b..aab1b12fbe 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 @@ -173,8 +173,6 @@ public class WorkstationService { int issueUpcomingCount = extIssuesMapper.getCountUpcoming(projectIds, userId); int apiUpcomingCount = extApiDefinitionMapper.getCountUpcoming(projectIds, userId); int apiCaseUpcomingCount = extApiTestCaseMapper.getCountUpcoming(projectIds, userId); - int updateApiCaseCount = getUpdateApiCaseCount(projectIds, userId); - int apiCaseCount = apiCaseUpcomingCount + updateApiCaseCount; int scenarioUpcomingCount = extApiScenarioMapper.getCountUpcoming(projectIds, userId); int loadUpcomingCount = extLoadTestMapper.getCountUpcoming(projectIds, userId); Map map = new HashMap<>(8); @@ -183,23 +181,12 @@ public class WorkstationService { map.put("track_review", reviewUpcomingCount); map.put("track_issue", issueUpcomingCount); map.put("api_definition", apiUpcomingCount); - map.put("api_case",apiCaseCount); + map.put("api_case",apiCaseUpcomingCount); map.put("api_automation", scenarioUpcomingCount); map.put("performance", loadUpcomingCount); return map; } - public int getUpdateApiCaseCount(List projectIds,String userId){ - int totalUpdateCount = 0; - for (String projectId : projectIds) { - List syncRuleCaseStatus = getSyncRuleCaseStatus(projectId); - Long toBeUpdatedTime = getToBeUpdatedTime(projectId); - int updateCount = extApiTestCaseMapper.getUpdateCount(userId, projectId, syncRuleCaseStatus, toBeUpdatedTime); - totalUpdateCount = totalUpdateCount+updateCount; - } - return totalUpdateCount; - } - public List getSyncRuleCaseStatus(String projectId) { List statusList = new ArrayList<>(); List projectApplicationConfigs = extProjectApplicationMapper.selectByProjectIdAndType(projectId,"TRIGGER_UPDATE");