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

fix(测试跟踪): 功能用例导出自定义字段显示的是id 

--bug=1016670 --user=陈建星 【测试跟踪】github#17785，功能用例导出，自定义字段显示错误 https://www.tapd.cn/55049933/s/1243888
This commit is contained in:
chenjianxing 2022-09-16 11:56:56 +08:00 committed by jianxing
parent 16f82cee48
commit 45e8b3cd3c
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1503,7 +1503,8 @@ public class TestCaseService {
}
for (CustomFieldDao dto : customFieldList) {
Map<String, String> map = new HashMap<>();
if (StringUtils.equals("select", dto.getType())) {
if (StringUtils.equalsAny(dto.getType(), CustomFieldType.SELECT.getValue(), CustomFieldType.MULTIPLE_SELECT.getValue(),
CustomFieldType.CHECKBOX.getValue(), CustomFieldType.RADIO.getValue())) {
try {
JSONArray optionsArr = JSONArray.parseArray(dto.getOptions());
for (int i = 0; i < optionsArr.size(); i++) {
@ -1623,13 +1624,27 @@ public class TestCaseService {
if (obj.containsKey("name") && obj.containsKey("value")) {
//进行key value对换
String name = obj.getString("name");
String value = obj.getString("value");
if (customSelectValueMap.containsKey(name)) {
if (customSelectValueMap.get(name).containsKey(value)) {
value = customSelectValueMap.get(name).get(value);
Object value = obj.get("value");
if (value instanceof List) {
List<String> values = ((List) value);
for (int i = 0; i < values.size(); i++) {
String item = values.get(i);
if (customSelectValueMap.containsKey(name)) {
if (customSelectValueMap.get(name).containsKey(item)) {
values.set(i, customSelectValueMap.get(name).get(item));
}
}
}
} else {
if (customSelectValueMap.containsKey(name)) {
if (customSelectValueMap.get(name).containsKey(value)) {
value = customSelectValueMap.get(name).get(value);
}
}
}
map.put(name, value);
map.put(name, value.toString());
}
}
data.setCustomDatas(map);