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-20 19:42:52 +08:00 committed by Craftsman
parent e29fdbfb88
commit d370961a28
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,10 @@ import java.util.List;
*/
public class CustomFieldMultipleMemberValidator extends CustomFieldMemberValidator {
public CustomFieldMultipleMemberValidator(String projectId) {
super(projectId);
}
@Override
public void validate(TemplateCustomFieldDTO customField, String value) throws CustomFieldValidateException {
validateArrayRequired(customField, value);
@ -54,15 +58,15 @@ public class CustomFieldMultipleMemberValidator extends CustomFieldMemberValidat
if (StringUtils.isBlank(keyOrValuesStr)) {
return JSON.toJSONString(new ArrayList<>());
}
List<String> keyOrValues = parse2Array(keyOrValuesStr);
for (int i = 0; i < keyOrValues.size(); i++) {
String item = keyOrValues.get(i).toLowerCase();
if (userIdEmailMap.containsKey(item)) {
keyOrValues.set(i, userIdEmailMap.get(item));
List list = JSON.parseArray(keyOrValuesStr);
List<String> result = new ArrayList<>();
list.forEach(item -> {
if (super.userIdEmailMap.containsKey(item)) {
result.add(userIdEmailMap.get(item));
}
}
return JSON.toJSONString(keyOrValues);
});
return String.join(",", JSON.parseArray(JSON.toJSONString(result)));
}
}

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

@ -56,12 +56,14 @@ public class CustomFieldMultipleSelectValidator extends CustomFieldSelectValidat
if (StringUtils.isBlank(keyOrValuesStr) || StringUtils.equals(keyOrValuesStr, "[]")) {
return StringUtils.EMPTY;
}
String keyOrValues = String.join(",", JSON.parseArray(keyOrValuesStr));
List list = JSON.parseArray(keyOrValuesStr);
List<String> result = new ArrayList<>();
Map<String, String> optionValueMap = customField.getOptions().stream().collect(Collectors.toMap(CustomFieldOption::getValue, CustomFieldOption::getText));
if (optionValueMap.containsKey(keyOrValues)) {
result.add(optionValueMap.get(keyOrValues));
}
list.forEach(item -> {
if (optionValueMap.containsKey(item)) {
result.add(optionValueMap.get(item));
}
});
return String.join(",", JSON.parseArray(JSON.toJSONString(result)));
}

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

@ -29,7 +29,7 @@ public class CustomFieldValidatorFactory {
validatorMap.put(CustomFieldType.DATETIME.name(), new CustomFieldDateTimeValidator());
validatorMap.put(CustomFieldType.MEMBER.name(), new CustomFieldMemberValidator(projectId));
validatorMap.put(CustomFieldType.MULTIPLE_MEMBER.name(), new CustomFieldMultipleMemberValidator());
validatorMap.put(CustomFieldType.MULTIPLE_MEMBER.name(), new CustomFieldMultipleMemberValidator(projectId));
validatorMap.put(CustomFieldType.INT.name(), new CustomFieldIntegerValidator());
validatorMap.put(CustomFieldType.FLOAT.name(), new CustomFieldFloatValidator());