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:
Jianguo-Genius 2024-11-18 18:39:39 +08:00 committed by 刘瑞斌
parent 954ecca484
commit 8244a9a92c
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioService.java
View File

@ -7,7 +7,6 @@ import io.metersphere.api.controller.result.ApiResultCode;
import io.metersphere.api.domain.*; import io.metersphere.api.domain.*;
import io.metersphere.api.dto.*; import io.metersphere.api.dto.*;
import io.metersphere.api.dto.debug.ApiFileResourceUpdateRequest; import io.metersphere.api.dto.debug.ApiFileResourceUpdateRequest;
import io.metersphere.api.dto.definition.ExecHistoryDTO;
import io.metersphere.api.dto.definition.ExecutePageRequest; import io.metersphere.api.dto.definition.ExecutePageRequest;
import io.metersphere.api.dto.definition.ExecuteReportDTO; import io.metersphere.api.dto.definition.ExecuteReportDTO;
import io.metersphere.api.dto.export.MetersphereApiScenarioExportResponse; import io.metersphere.api.dto.export.MetersphereApiScenarioExportResponse;
@ -86,7 +85,6 @@ import org.mybatis.spring.SqlSessionUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicLong;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
@ -1871,7 +1869,7 @@ public class ApiScenarioService extends MoveNodeService {
refScenarioSteps = childStep.stream().filter(k -> isScenarioStep(k.getStepType())).toList(); refScenarioSteps = childStep.stream().filter(k -> isScenarioStep(k.getStepType())).toList();
} }
// 嵌套获取引用的场景步骤 // 嵌套获取引用的场景步骤
return returnList; return returnList.stream().sorted(Comparator.comparing(ApiScenarioStepDTO::getSort)).collect(Collectors.toList());
} }
private List<ApiScenarioStepDTO> getStepDTOByScenarioIds(List<String> scenarioIds) { private List<ApiScenarioStepDTO> getStepDTOByScenarioIds(List<String> scenarioIds) {