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

fix(测试用例): 用例导入#1006119 

--bug=1006119 --user=lyh
【github#5522】测试跟踪的接口用例导出后，缺少了责任人和用例状态信息，导致无法重新导入
https://www.tapd.cn/55049933/s/1038757
This commit is contained in:
shiziyuan9527 2021-08-24 16:35:30 +08:00 committed by 刘瑞斌
parent b5911dfdaa
commit fdee19561e
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/src/main/java/io/metersphere/excel/domain/TestCaseExcelDataTw.java
View File

@ -129,11 +129,18 @@ public class TestCaseExcelDataTw extends TestCaseExcelData {
list9.add("用例等級");
returnList.add(list9);
List<String> list10 = new ArrayList<>();
list10.add("用例狀態");
returnList.add(list10);
if(CollectionUtils.isNotEmpty(customFields)){
for (CustomFieldDao dto:customFields) {
if(StringUtils.equals(dto.getName(),"用例等級")){
continue;
}
if(StringUtils.equals(dto.getName(),"用例状态")){
continue;
}
List<String> list = new ArrayList<>();
if (StringUtils.equals(dto.getName(), "责任人")) {
list.add("維護人(ID)");

9
backend/src/main/java/io/metersphere/excel/domain/TestCaseExcelDataUs.java
View File

@ -129,9 +129,16 @@ public class TestCaseExcelDataUs extends TestCaseExcelData {
list9.add("Priority");
returnList.add(list9);
List<String> list10 = new ArrayList<>();
list10.add("Case status");
returnList.add(list10);
if(CollectionUtils.isNotEmpty(customFields)){
for (CustomFieldDao dto:customFields) {
if(StringUtils.equals(dto.getName(),"Priority")){
if(StringUtils.equals(dto.getName(),"用例等级")){
continue;
}
if(StringUtils.equals(dto.getName(),"用例状态")){
continue;
}
List<String> list = new ArrayList<>();

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

@ -980,9 +980,15 @@ public class TestCaseService {
list.add(model.getStepModel());
}else if(StringUtils.equalsAnyIgnoreCase(head,"Priority","用例等級","用例等级")){
list.add(model.getPriority());
}else {
}else if(StringUtils.equalsAnyIgnoreCase(head,"Case status","用例状态","用例狀態")){
list.add(model.getStatus());
} else if (StringUtils.equalsAnyIgnoreCase(head, "Maintainer(ID)", "责任人(ID)", "維護人(ID)")) {
String value = customDataMaps.get("责任人");
value = value == null ? "" : value;
list.add(value);
} else {
String value = customDataMaps.get(head);
if(value == null){
if (value == null) {
value = "";
}
list.add(value);