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:
WangXu10 2024-08-16 15:51:41 +08:00 committed by 刘瑞斌
parent 2820fdf6ec
commit 685e5d9934
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
backend/services/case-management/src/main/java/io/metersphere/functional/excel/validate/CustomFieldMultipleSelectValidator.java
View File

@ -8,7 +8,10 @@ import io.metersphere.system.domain.CustomFieldOption;
import io.metersphere.system.dto.sdk.TemplateCustomFieldDTO; import io.metersphere.system.dto.sdk.TemplateCustomFieldDTO;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import java.util.*; import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@ -50,18 +53,16 @@ public class CustomFieldMultipleSelectValidator extends CustomFieldSelectValidat
@Override @Override
public Object parse2Value(String keyOrValuesStr, TemplateCustomFieldDTO customField) { public Object parse2Value(String keyOrValuesStr, TemplateCustomFieldDTO customField) {
Map<String, String> optionValueMap = customField.getOptions().stream().collect(Collectors.toMap(CustomFieldOption::getFieldId, CustomFieldOption::getValue)); if (StringUtils.isBlank(keyOrValuesStr) || StringUtils.equals(keyOrValuesStr, "[]")) {
if (StringUtils.isBlank(keyOrValuesStr)) { return StringUtils.EMPTY;
return JSON.toJSONString(new ArrayList<>());
} }
List<String> keyOrValues = parse2Array(keyOrValuesStr); String keyOrValues = String.join(",", JSON.parseArray(keyOrValuesStr));
for (int i = 0; i < keyOrValues.size(); i++) { List<String> result = new ArrayList<>();
String item = keyOrValues.get(i); Map<String, String> optionValueMap = customField.getOptions().stream().collect(Collectors.toMap(CustomFieldOption::getValue, CustomFieldOption::getText));
if (optionValueMap.containsKey(item)) { if (optionValueMap.containsKey(keyOrValues)) {
keyOrValues.set(i, optionValueMap.get(item)); result.add(optionValueMap.get(keyOrValues));
} }
} return String.join(",", JSON.parseArray(JSON.toJSONString(result)));
return JSON.toJSONString(keyOrValues);
} }
} }

2
backend/services/case-management/src/main/java/io/metersphere/functional/excel/validate/CustomFieldSelectValidator.java
View File

@ -62,7 +62,7 @@ public class CustomFieldSelectValidator extends AbstractCustomFieldValidator {
@Override @Override
public Object parse2Value(String keyOrValuesStr, TemplateCustomFieldDTO customField) { public Object parse2Value(String keyOrValuesStr, TemplateCustomFieldDTO customField) {
Map<String, String> optionValueMap = customField.getOptions().stream().collect(Collectors.toMap(CustomFieldOption::getFieldId, CustomFieldOption::getValue)); Map<String, String> optionValueMap = customField.getOptions().stream().collect(Collectors.toMap(CustomFieldOption::getValue, CustomFieldOption::getText));
if (optionValueMap.containsKey(keyOrValuesStr)) { if (optionValueMap.containsKey(keyOrValuesStr)) {
return optionValueMap.get(keyOrValuesStr); return optionValueMap.get(keyOrValuesStr);
} }