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:
chenjianxing 2021-08-19 09:53:19 +08:00 committed by jianxing
parent d46a4b9f46
commit 71c5042e71
4 changed files with 4 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1247,19 +1247,7 @@ public class TestCaseService {
final TestCaseWithBLOBs testCaseWithBLOBs = addTestCase(request);
//插入测试与用例关系表
if (!CollectionUtils.isEmpty(request.getSelected())) {
List<List<String>> selecteds = request.getSelected();
TestCaseTest test = new TestCaseTest();
selecteds.forEach(id -> {
test.setTestType(id.get(0));
test.setTestId(id.get(id.size() - 1));
test.setTestCaseId(request.getId());
test.setCreateTime(System.currentTimeMillis());
test.setUpdateTime(System.currentTimeMillis());
testCaseTestMapper.insert(test);
});
}
// 复制用例时传入文件ID进行复制
if (!CollectionUtils.isEmpty(request.getFileIds())) {
List<String> fileIds = request.getFileIds();
@ -1291,26 +1279,6 @@ public class TestCaseService {
if (testCaseWithBLOBs == null) {
MSException.throwException(Translator.get("edit_load_test_not_found") + request.getId());
}
//插入测试与用例关系表
TestCaseTestExample example = new TestCaseTestExample();
example.createCriteria().andTestCaseIdEqualTo(request.getId());
List<TestCaseTest> list = testCaseTestMapper.selectByExample(example);
if (list.size() > 0) {
testCaseTestMapper.deleteByExample(example);
}
List<List<String>> selecteds = request.getSelected();
TestCaseTest test = new TestCaseTest();
LogUtil.info("关联的测试用例:" + selecteds);
if (selecteds != null) {
selecteds.forEach(id -> {
test.setTestType(id.get(0));
test.setTestId(id.get(id.size() - 1));
test.setCreateTime(System.currentTimeMillis());
test.setUpdateTime(System.currentTimeMillis());
test.setTestCaseId(request.getId());
testCaseTestMapper.insert(test);
});
}
// 新选择了一个文件，删除原来的文件
List<FileMetadata> updatedFiles = request.getUpdatedFileList();
@ -1327,7 +1295,6 @@ public class TestCaseService {
testCaseFileMapper.deleteByExample(testCaseFileExample);
}
if (files != null) {
files.forEach(file -> {
final FileMetadata fileMetadata = fileService.saveFile(file, testCaseWithBLOBs.getProjectId());

2
frontend/src/business/components/track/case/components/TestCaseRelateApiList.vue
View File

@ -84,7 +84,7 @@ export default {
{text: 'P3', value: 'P3'}
],
methodColorMap: new Map(API_METHOD_COLOUR),
screenHeight: 'calc(100vh - 600px)',//屏幕高度
screenHeight: '600px',//屏幕高度
tableData: [],
currentPage: 1,
pageSize: 10,

2
frontend/src/business/components/track/case/components/TestCaseRelateLoadList.vue
View File

@ -62,7 +62,7 @@ export default {
return {
condition: {},
result: {},
screenHeight: 'calc(100vh - 600px)',//屏幕高度
screenHeight: '600px',//屏幕高度
tableData: [],
currentPage: 1,
pageSize: 10,

2
frontend/src/business/components/track/case/components/TestCaseRelateScenarioList.vue
View File

@ -94,7 +94,7 @@ export default {
{text: 'P2', value: 'P2'},
{text: 'P3', value: 'P3'}
],
screenHeight: 'calc(100vh - 600px)',//屏幕高度
screenHeight: '600px',//屏幕高度
tableData: [],
currentPage: 1,
pageSize: 10,