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

fix(接口定义): 修复场景报告导出时误报信息为空的缺陷 

--bug=1014516 --user=王孝刚 【接口测试】场景报告-查看详情-导出报告，中间的步骤统计没有误报
https://www.tapd.cn/55049933/s/1193718
This commit is contained in:
wxg0103 2022-07-04 11:42:09 +08:00 committed by f2c-ci-robot[bot]
parent 8c31558e13
commit 44fc67f70c
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/main/java/io/metersphere/api/service/ApiScenarioReportStructureService.java
View File

@ -258,17 +258,20 @@ public class ApiScenarioReportStructureService {
dto.setValue(requestResultExpandDTO);
dto.setErrorCode(reportResults.get(0).getErrorCode());
}
dto.setTotalStatus(reportResult.getStatus());
} else {
if (reportResult.getContent() != null) {
StepTreeDTO step = new StepTreeDTO(dto.getLabel(), UUID.randomUUID().toString(), dto.getType(), reportResults.get(i).getId(), (i + 1));
step.setValue(JSON.parseObject(new String(reportResults.get(i).getContent(), StandardCharsets.UTF_8), RequestResult.class));
step.setErrorCode(reportResults.get(i).getErrorCode());
step.setTotalStatus(reportResults.get(i).getStatus());
dtoList.add(step);
} else {
StepTreeDTO step = new StepTreeDTO(dto.getLabel(), UUID.randomUUID().toString(), dto.getType(), reportResults.get(i).getId(), (i + 1));
RequestResultExpandDTO requestResultExpandDTO = new RequestResultExpandDTO(reportResult);
step.setValue(requestResultExpandDTO);
step.setErrorCode(reportResults.get(i).getErrorCode());
step.setTotalStatus(reportResults.get(i).getStatus());
dtoList.add(step);
}
}
@ -286,6 +289,7 @@ public class ApiScenarioReportStructureService {
dto.setErrorCode(reportResults.get(0).getErrorCode());
dto.setTotalStatus(requestResultExpandDTO.getStatus());
}
dto.setTotalStatus(reportResult.getStatus());
}
}
if (StringUtils.isNotEmpty(dto.getType()) && requests.contains(dto.getType()) && dto.getValue() == null || isUiUnExecuteCommand(dto)) {
@ -303,7 +307,7 @@ public class ApiScenarioReportStructureService {
} else {
if (dto.getValue() instanceof RequestResultExpandDTO && StringUtils.isNotEmpty(((RequestResultExpandDTO) dto.getValue()).getStatus())) {
dto.setTotalStatus(((RequestResultExpandDTO) dto.getValue()).getStatus());
} else if (dto.getValue() != null) {
} else if (dto.getValue() != null && StringUtils.isEmpty(dto.getTotalStatus())) {
if (dto.getValue().getError() > 0 || BooleanUtils.isNotTrue(dto.getValue().isSuccess())) {
dto.setTotalStatus("fail");
} else {