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

refactor(缺陷管理): 禅道缺陷自定义字段 (#4292) 

Co-authored-by: shiziyuan9527 <yuhao.li@fit2cloud.com>
--story=1001104 --user=李玉号 禅道缺陷模板支持自定义字段 https://www.tapd.cn/55049933/s/1024011
This commit is contained in:
metersphere-bot 2021-07-01 19:31:33 +08:00 committed by GitHub
parent 056dcb4116
commit 023735cbbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
backend/src/main/java/io/metersphere/track/issue/ZentaoPlatform.java
View File

@ -12,6 +12,7 @@ import io.metersphere.commons.constants.IssuesManagePlatform;
import io.metersphere.commons.constants.IssuesStatus;
import io.metersphere.commons.exception.MSException;
import io.metersphere.commons.utils.LogUtil;
import io.metersphere.dto.CustomFieldItemDTO;
import io.metersphere.dto.UserDTO;
import io.metersphere.track.dto.DemandDTO;
import io.metersphere.track.issue.client.ZentaoClient;
@ -161,9 +162,17 @@ public class ZentaoPlatform extends AbstractIssuePlatform {
if (StringUtils.isBlank(projectId)) {
MSException.throwException("未关联禅道项目ID.");
}
List<CustomFieldItemDTO> customFields = getCustomFields(issuesRequest.getCustomFields());
MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
paramMap.add("product", projectId);
paramMap.add("title", issuesRequest.getTitle());
customFields.forEach(item -> {
if (StringUtils.isNotBlank(item.getCustomData())) {
paramMap.add(item.getCustomData(), item.getValue());
}
});
String description = issuesRequest.getDescription();
String zentaoSteps = description;
@ -186,24 +195,28 @@ public class ZentaoPlatform extends AbstractIssuePlatform {
paramMap.add("assignedTo", issuesRequest.getZentaoAssigned());
}
AddIssueResponse.Issue issue = zentaoClient.addIssue(paramMap);
issuesRequest.setPlatformStatus(issue.getStatus());
try {
AddIssueResponse.Issue issue = zentaoClient.addIssue(paramMap);
issuesRequest.setPlatformStatus(issue.getStatus());
String id = issue.getId();
if (StringUtils.isNotBlank(id)) {
issuesRequest.setId(id);
// 用例与第三方缺陷平台中的缺陷关联
handleTestCaseIssues(issuesRequest);
String id = issue.getId();
if (StringUtils.isNotBlank(id)) {
issuesRequest.setId(id);
// 用例与第三方缺陷平台中的缺陷关联
handleTestCaseIssues(issuesRequest);
IssuesExample issuesExample = new IssuesExample();
issuesExample.createCriteria().andIdEqualTo(id)
.andPlatformEqualTo(IssuesManagePlatform.Zentao.toString());
if (issuesMapper.selectByExample(issuesExample).size() <= 0) {
// 插入缺陷表
insertIssues(id, issuesRequest);
IssuesExample issuesExample = new IssuesExample();
issuesExample.createCriteria().andIdEqualTo(id)
.andPlatformEqualTo(IssuesManagePlatform.Zentao.toString());
if (issuesMapper.selectByExample(issuesExample).size() <= 0) {
// 插入缺陷表
insertIssues(id, issuesRequest);
}
}
} catch (Exception e) {
LogUtil.error(e.getMessage(), e);
MSException.throwException("提交禅道缺陷失败!");
}
}
@Override