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-07-15 10:57:20 +08:00 committed by 建国
parent 009197bf81
commit 329be033b5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanBatchOperationService.java
View File

@ -166,6 +166,7 @@ public class TestPlanBatchOperationService extends TestPlanBaseUtilsService {
String moduleId = originalTestPlan.getModuleId(); String moduleId = originalTestPlan.getModuleId();
String groupId = originalTestPlan.getGroupId(); String groupId = originalTestPlan.getGroupId();
long pos = originalTestPlan.getPos(); long pos = originalTestPlan.getPos();
String sortRangeId = TestPlanConstants.TEST_PLAN_DEFAULT_GROUP_ID;
if (StringUtils.equals(targetType, TestPlanConstants.TEST_PLAN_TYPE_GROUP)) { if (StringUtils.equals(targetType, TestPlanConstants.TEST_PLAN_TYPE_GROUP)) {
if (!StringUtils.equalsIgnoreCase(targetId, TestPlanConstants.TEST_PLAN_DEFAULT_GROUP_ID)) { if (!StringUtils.equalsIgnoreCase(targetId, TestPlanConstants.TEST_PLAN_DEFAULT_GROUP_ID)) {
TestPlan group = testPlanMapper.selectByPrimaryKey(targetId); TestPlan group = testPlanMapper.selectByPrimaryKey(targetId);
@ -174,6 +175,7 @@ public class TestPlanBatchOperationService extends TestPlanBaseUtilsService {
testPlanGroupService.validateGroupCapacity(targetId, 1); testPlanGroupService.validateGroupCapacity(targetId, 1);
} }
moduleId = group.getModuleId(); moduleId = group.getModuleId();
sortRangeId = targetId;
} }
groupId = targetId; groupId = targetId;
} else { } else {
@ -192,7 +194,7 @@ public class TestPlanBatchOperationService extends TestPlanBaseUtilsService {
testPlan.setUpdateTime(operatorTime); testPlan.setUpdateTime(operatorTime);
testPlan.setModuleId(moduleId); testPlan.setModuleId(moduleId);
testPlan.setGroupId(groupId); testPlan.setGroupId(groupId);
testPlan.setPos(testPlanGroupService.getNextOrder(targetId)); testPlan.setPos(testPlanGroupService.getNextOrder(sortRangeId));
testPlan.setActualEndTime(null); testPlan.setActualEndTime(null);
testPlan.setActualStartTime(null); testPlan.setActualStartTime(null);
testPlan.setStatus(TestPlanConstants.TEST_PLAN_STATUS_NOT_ARCHIVED); testPlan.setStatus(TestPlanConstants.TEST_PLAN_STATUS_NOT_ARCHIVED);