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

fix(测试跟踪): 禅道平台自定义字段导入导出问题 

--bug=1020982 --user=宋昌昌 【测试跟踪】禅道v17.8版本-导入缺陷-导入失败-提示字段不存在 https://www.tapd.cn/55049933/s/1317635
This commit is contained in:
song-cc-rock 2022-12-20 17:31:59 +08:00 committed by jianxing
parent 297828c2d0
commit 322416d1da
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test-track/backend/src/main/java/io/metersphere/service/IssuesService.java
View File

@ -703,18 +703,7 @@ public class IssuesService {
Map<String, List<CustomFieldDao>> fieldMap = Map<String, List<CustomFieldDao>> fieldMap =
customFieldIssuesService.getMapByResourceIds(data.stream().map(IssuesDao::getId).collect(Collectors.toList())); customFieldIssuesService.getMapByResourceIds(data.stream().map(IssuesDao::getId).collect(Collectors.toList()));
try { try {
Map<String, CustomField> fieldMaps = new HashMap<>(); Map<String, CustomField> fieldMaps = customFields.stream().collect(Collectors.toMap(CustomFieldDao::getId, field -> (CustomField) field));
if (isThirdTemplate) {
fieldMaps = customFields.stream().collect(Collectors.toMap(CustomFieldDao::getId, field -> (CustomField) field));
} else {
List<CustomFieldDao> customfields = fieldMap.get(data.get(0).getId());
if (CollectionUtils.isNotEmpty(customfields) && customfields.size() > 0) {
List<String> ids = customfields.stream().map(CustomFieldDao::getId).collect(Collectors.toList());
List<CustomField> issueFields = baseCustomFieldService.getFieldByIds(ids);
fieldMaps = issueFields.stream().collect(Collectors.toMap(CustomField::getId, field -> field));
}
}
for (Map.Entry<String, List<CustomFieldDao>> entry : fieldMap.entrySet()) { for (Map.Entry<String, List<CustomFieldDao>> entry : fieldMap.entrySet()) {
for (CustomFieldDao fieldDao : entry.getValue()) { for (CustomFieldDao fieldDao : entry.getValue()) {
CustomField customField = fieldMaps.get(fieldDao.getId()); CustomField customField = fieldMaps.get(fieldDao.getId());
@ -1531,9 +1520,12 @@ public class IssuesService {
MSException.throwException(Translator.get("upload_fail")); MSException.throwException(Translator.get("upload_fail"));
} }
Map<String, String> userMap = baseUserService.getProjectMemberOption(request.getProjectId()).stream().collect(Collectors.toMap(User::getId, User::getName)); Map<String, String> userMap = baseUserService.getProjectMemberOption(request.getProjectId()).stream().collect(Collectors.toMap(User::getId, User::getName));
// 获取第三方平台自定义字段
List<CustomFieldDao> pluginCustomFields = getPluginCustomFields(request.getProjectId());
// 获取缺陷模板及自定义字段 // 获取缺陷模板及自定义字段
IssueTemplateDao issueTemplate = getIssueTemplateByProjectId(request.getProjectId()); IssueTemplateDao issueTemplate = getIssueTemplateByProjectId(request.getProjectId());
List<CustomFieldDao> customFields = Optional.ofNullable(issueTemplate.getCustomFields()).orElse(new ArrayList<>()); List<CustomFieldDao> customFields = Optional.ofNullable(issueTemplate.getCustomFields()).orElse(new ArrayList<>());
customFields.addAll(pluginCustomFields);
// 获取本地EXCEL数据对象 // 获取本地EXCEL数据对象
Class clazz = new IssueExcelDataFactory().getExcelDataByLocal(); Class clazz = new IssueExcelDataFactory().getExcelDataByLocal();
// IssueExcelListener读取file内容 // IssueExcelListener读取file内容
@ -1559,9 +1551,12 @@ public class IssuesService {
public void issueExport(IssueExportRequest request, HttpServletResponse response) { public void issueExport(IssueExportRequest request, HttpServletResponse response) {
EasyExcelExporter.resetCellMaxTextLength(); EasyExcelExporter.resetCellMaxTextLength();
Map<String, String> userMap = baseUserService.getProjectMemberOption(request.getProjectId()).stream().collect(Collectors.toMap(User::getId, User::getName)); Map<String, String> userMap = baseUserService.getProjectMemberOption(request.getProjectId()).stream().collect(Collectors.toMap(User::getId, User::getName));
// 第三方平台的自定义字段
List<CustomFieldDao> pluginCustomFields = getPluginCustomFields(request.getProjectId());
// 获取缺陷模板及自定义字段 // 获取缺陷模板及自定义字段
IssueTemplateDao issueTemplate = getIssueTemplateByProjectId(request.getProjectId()); IssueTemplateDao issueTemplate = getIssueTemplateByProjectId(request.getProjectId());
List<CustomFieldDao> customFields = Optional.ofNullable(issueTemplate.getCustomFields()).orElse(new ArrayList<>()); List<CustomFieldDao> customFields = Optional.ofNullable(issueTemplate.getCustomFields()).orElse(new ArrayList<>());
customFields.addAll(pluginCustomFields);
// 根据自定义字段获取表头内容 // 根据自定义字段获取表头内容
List<List<String>> heads = new IssueExcelDataFactory().getIssueExcelDataLocal().getHead(issueTemplate.getIsThirdTemplate(), customFields, request); List<List<String>> heads = new IssueExcelDataFactory().getIssueExcelDataLocal().getHead(issueTemplate.getIsThirdTemplate(), customFields, request);
// 获取导出缺陷列表 // 获取导出缺陷列表