fix(接口测试): 修复删除独立报告会把全部报告删除的缺陷
--bug=1038050 --user=王孝刚 【接口测试】报告-场景报告/用例报告-独立报告/集合报告-全选所有页删除-会将独立报告和集合报告全删除 https://www.tapd.cn/55049933/s/1483791
This commit is contained in:
parent
3fb085c6b2
commit
d7135d57f7
|
@ -284,27 +284,6 @@ public class ApiScenarioReportService {
|
||||||
for (ApiScenarioReportStepDTO step : steps) {
|
for (ApiScenarioReportStepDTO step : steps) {
|
||||||
List<ApiScenarioReportStepDTO> children = scenarioReportStepMap.get(step.getStepId());
|
List<ApiScenarioReportStepDTO> children = scenarioReportStepMap.get(step.getStepId());
|
||||||
if (CollectionUtils.isNotEmpty(children)) {
|
if (CollectionUtils.isNotEmpty(children)) {
|
||||||
//如果是循环控制器 需要重新处理
|
|
||||||
/*if (StringUtils.equals(ApiScenarioStepType.LOOP_CONTROLLER.name(), step.getStepType())) {
|
|
||||||
//根据stepId进行分组
|
|
||||||
Map<String, List<ApiScenarioReportStepDTO>> loopMap = children.stream().collect(Collectors.groupingBy(ApiScenarioReportStepDTO::getStepId));
|
|
||||||
List<ApiScenarioReportStepDTO> newChildren = new ArrayList<>();
|
|
||||||
loopMap.forEach((key, value) -> {
|
|
||||||
ApiScenarioReportStepDTO loopStep = new ApiScenarioReportStepDTO();
|
|
||||||
BeanUtils.copyBean(loopStep, value.getFirst());
|
|
||||||
newChildren.add(loopStep);
|
|
||||||
value.sort(Comparator.comparingLong(ApiScenarioReportStepDTO::getLoopIndex));
|
|
||||||
for (int i = 0; i < value.size(); i++) {
|
|
||||||
ApiScenarioReportStepDTO loop = value.get(i);
|
|
||||||
loop.setSort((long) i+1);
|
|
||||||
loop.setParentId(key);
|
|
||||||
loop.setStepId(loopStep.getStepId() + SPLITTER + loop.getSort());
|
|
||||||
}
|
|
||||||
scenarioReportStepMap.put(key, value);
|
|
||||||
});
|
|
||||||
children = newChildren;
|
|
||||||
scenarioReportStepMap.remove(step.getStepId());
|
|
||||||
}*/
|
|
||||||
children.sort(Comparator.comparingLong(ApiScenarioReportStepDTO::getSort));
|
children.sort(Comparator.comparingLong(ApiScenarioReportStepDTO::getSort));
|
||||||
step.setChildren(children);
|
step.setChildren(children);
|
||||||
getStepTree(children, scenarioReportStepMap);
|
getStepTree(children, scenarioReportStepMap);
|
||||||
|
|
|
@ -332,7 +332,14 @@
|
||||||
batchParams.value = {
|
batchParams.value = {
|
||||||
...params,
|
...params,
|
||||||
selectIds: params?.selectedIds || [],
|
selectIds: params?.selectedIds || [],
|
||||||
condition: {},
|
condition: {
|
||||||
|
filter: {
|
||||||
|
status: statusListFilters.value,
|
||||||
|
integrated: showType.value === 'All' ? undefined : Array.of((showType.value === 'INTEGRATED').toString()),
|
||||||
|
triggerMode: triggerModeListFilters.value,
|
||||||
|
},
|
||||||
|
keyword: keyword.value,
|
||||||
|
},
|
||||||
projectId: appStore.currentProjectId,
|
projectId: appStore.currentProjectId,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue