test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(测试计划): 执行历史数量返回

This commit is contained in:
WangXu10 2024-05-24 11:24:16 +08:00 committed by 刘瑞斌
parent 7483276017
commit 180c0be7e0
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanFunctionalCaseService.java
View File

@ -16,10 +16,7 @@ import io.metersphere.functional.mapper.FunctionalCaseMapper;
import io.metersphere.functional.service.FunctionalCaseAttachmentService; import io.metersphere.functional.service.FunctionalCaseAttachmentService;
import io.metersphere.functional.service.FunctionalCaseModuleService; import io.metersphere.functional.service.FunctionalCaseModuleService;
import io.metersphere.functional.service.FunctionalCaseService; import io.metersphere.functional.service.FunctionalCaseService;
import io.metersphere.plan.domain.TestPlan; import io.metersphere.plan.domain.*;
import io.metersphere.plan.domain.TestPlanCaseExecuteHistory;
import io.metersphere.plan.domain.TestPlanFunctionalCase;
import io.metersphere.plan.domain.TestPlanFunctionalCaseExample;
import io.metersphere.plan.dto.AssociationNodeSortDTO; import io.metersphere.plan.dto.AssociationNodeSortDTO;
import io.metersphere.plan.dto.ResourceLogInsertModule; import io.metersphere.plan.dto.ResourceLogInsertModule;
import io.metersphere.plan.dto.TestPlanCaseRunResultCount; import io.metersphere.plan.dto.TestPlanCaseRunResultCount;
@ -554,7 +551,6 @@ public class TestPlanFunctionalCaseService extends TestPlanResourceService {
FunctionalCaseDetailDTO functionalCaseDetail = functionalCaseService.getFunctionalCaseDetail(caseId, userId, false); FunctionalCaseDetailDTO functionalCaseDetail = functionalCaseService.getFunctionalCaseDetail(caseId, userId, false);
String caseDetailSteps = functionalCaseDetail.getSteps(); String caseDetailSteps = functionalCaseDetail.getSteps();
List<TestPlanCaseExecuteHistory> testPlanCaseExecuteHistories = extTestPlanCaseExecuteHistoryMapper.selectSteps(id, caseId); List<TestPlanCaseExecuteHistory> testPlanCaseExecuteHistories = extTestPlanCaseExecuteHistoryMapper.selectSteps(id, caseId);
Integer runListCount = 0;
List<FunctionalCaseStepDTO> functionalCaseStepDTOS = new ArrayList<>(); List<FunctionalCaseStepDTO> functionalCaseStepDTOS = new ArrayList<>();
if (CollectionUtils.isNotEmpty(testPlanCaseExecuteHistories)) { if (CollectionUtils.isNotEmpty(testPlanCaseExecuteHistories)) {
TestPlanCaseExecuteHistory testPlanCaseExecuteHistory = testPlanCaseExecuteHistories.get(0); TestPlanCaseExecuteHistory testPlanCaseExecuteHistory = testPlanCaseExecuteHistories.get(0);
@ -564,7 +560,6 @@ public class TestPlanFunctionalCaseService extends TestPlanResourceService {
functionalCaseStepDTOS = newCaseSteps; functionalCaseStepDTOS = newCaseSteps;
functionalCaseDetail.setSteps(JSON.toJSONString(functionalCaseStepDTOS)); functionalCaseDetail.setSteps(JSON.toJSONString(functionalCaseStepDTOS));
} }
runListCount = testPlanCaseExecuteHistories.size();
} else { } else {
if (StringUtils.isNotBlank(caseDetailSteps)) { if (StringUtils.isNotBlank(caseDetailSteps)) {
functionalCaseStepDTOS = JSON.parseArray(caseDetailSteps, FunctionalCaseStepDTO.class); functionalCaseStepDTOS = JSON.parseArray(caseDetailSteps, FunctionalCaseStepDTO.class);
@ -573,7 +568,11 @@ public class TestPlanFunctionalCaseService extends TestPlanResourceService {
} }
TestPlanCaseDetailResponse response = new TestPlanCaseDetailResponse(); TestPlanCaseDetailResponse response = new TestPlanCaseDetailResponse();
BeanUtils.copyBean(response, functionalCaseDetail); BeanUtils.copyBean(response, functionalCaseDetail);
response.setRunListCount(runListCount);
TestPlanCaseExecuteHistoryExample testPlanCaseExecuteHistoryExample = new TestPlanCaseExecuteHistoryExample();
testPlanCaseExecuteHistoryExample.createCriteria().andCaseIdEqualTo(caseId).andTestPlanCaseIdEqualTo(id).andDeletedEqualTo(false);
testPlanCaseExecuteHistoryExample.setOrderByClause("create_time DESC");
response.setRunListCount((int) testPlanCaseExecuteHistoryMapper.countByExample(testPlanCaseExecuteHistoryExample));
response.setBugListCount(getBugListCount(id, planFunctionalCase.getTestPlanId())); response.setBugListCount(getBugListCount(id, planFunctionalCase.getTestPlanId()));
return response; return response;
} }