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

fix(测试跟踪): 功能用例导入后顺序和表格不一致 

--bug=1016018 --user=陈建星 【测试跟踪】导入用例，导入后的用例顺序和导入前不一致 https://www.tapd.cn/55049933/s/1229461
This commit is contained in:
chenjianxing 2022-08-22 16:07:13 +08:00 committed by jianxing
parent cc2327f055
commit e3b1d59b61
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
backend/src/main/java/io/metersphere/track/service/TestCaseService.java
View File

@ -197,7 +197,6 @@ public class TestCaseService {
private TestCaseTemplateService testCaseTemplateService;
private ThreadLocal<Integer> importCreateNum = new ThreadLocal<>();
private ThreadLocal<Integer> beforeImportCreateNum = new ThreadLocal<>();
private void setNode(TestCaseWithBLOBs testCase) {
if (StringUtils.isEmpty(testCase.getNodeId()) || "default-module".equals(testCase.getNodeId())) {
@ -932,7 +931,6 @@ public class TestCaseService {
}
int nextNum = getNextNum(request.getProjectId());
importCreateNum.set(nextNum);
beforeImportCreateNum.set(nextNum);
}
if (multipartFile.getOriginalFilename().endsWith(".xmind")) {
return testCaseXmindImport(multipartFile, request, httpRequest);
@ -1118,10 +1116,12 @@ public class TestCaseService {
ProjectConfig config = projectApplicationService.getSpecificTypeValue(project.getId(), ProjectApplicationType.CASE_CUSTOM_NUM.name());
boolean customNum = config.getCaseCustomNum();
try {
Long nextOrder = ServiceUtils.getNextOrder(projectId, extTestCaseMapper::getLastOrder);
if (!testCases.isEmpty()) {
Integer num = importCreateNum.get();
Integer beforeInsertId = beforeImportCreateNum.get();
for (TestCaseWithBLOBs testCase : testCases) {
Integer num = Math.max(importCreateNum.get(), getNextNum(request.getProjectId()));
for (int i = testCases.size() - 1; i > - 1; i--) { // 反向遍历，保持和文件顺序一致
TestCaseWithBLOBs testCase = testCases.get(i);
if (StringUtils.isBlank(testCase.getId())) {
testCase.setId(UUID.randomUUID().toString());
}
@ -1149,12 +1149,12 @@ public class TestCaseService {
if (StringUtils.isBlank(testCase.getStatus())) {
testCase.setStatus(TestCaseReviewStatus.Prepare.name());
}
testCase.setOrder(Long.valueOf(testCases.size() - (num - beforeInsertId)) * ServiceUtils.ORDER_STEP);
testCase.setOrder(nextOrder);
testCase.setRefId(testCase.getId());
testCase.setVersionId(request.getVersionId());
testCase.setLatest(true);
mapper.insert(testCase);
nextOrder += ServiceUtils.ORDER_STEP;
batchInsertCustomFieldTestCase(testCaseCustomFieldMap, customFieldTestCaseMapper, testCase);
}