test/MeterSphere
1
0
Fork 0
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git synced 2024-11-30 19:18:59 +08:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

fix(测试跟踪): 关联缺陷后修改缺陷状态报错问题 (#18445)

Browse Source 
--bug=1017664 --user=宋昌昌 【测试计划】关联缺陷后修改缺陷状态报错 https://www.tapd.cn/55049933/s/1258970

Co-authored-by: song-cc-rock <changchang.song@fit2cloud.com>
This commit is contained in:
MeterSphere Bot 2022-10-12 10:12:19 +08:00 committed by GitHub
parent 8779823c43
commit 7420376f22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,6 +48,7 @@ import io.metersphere.service.wapper.TrackProjectService;
import io.metersphere.xpack.track.dto.PlatformStatusDTO;
import io.metersphere.xpack.track.issue.IssuesPlatform;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.session.ExecutorType;
@ -268,9 +269,46 @@ public class IssuesService {
ServiceUtils.getDefaultOrder(issueRequest.getOrders());
issueRequest.setRefType(refType);
List<IssuesDao> issues = extIssuesMapper.getIssuesByCaseId(issueRequest);
handleCustomFieldStatus(issues);
return disconnectIssue(issues);
}
private void handleCustomFieldStatus(List<IssuesDao> issues) {
if (CollectionUtils.isEmpty(issues)) {
return;
}
List<String> issueIds = issues.stream().map(Issues::getId).collect(Collectors.toList());
String projectId = issues.get(0).getProjectId();
Project project = projectMapper.selectByPrimaryKey(projectId);
if (project == null) {
return;
}
String templateId = project.getIssueTemplateId();
if (StringUtils.isBlank(templateId)) {
return;
}
// 模版对于同一个系统字段应该只关联一次
List<CustomFieldDao> customFields = trackCustomFieldTemplateService.getCustomFieldByTemplateId(templateId);
List<String> fieldIds = customFields.stream()
.filter(customField -> StringUtils.equals(SystemCustomField.ISSUE_STATUS, customField.getName()))
.map(CustomFieldDao::getId).collect(Collectors.toList());
if (CollectionUtils.isEmpty(fieldIds)) {
return;
}
// 该系统字段的自定义ID
String customFieldId = fieldIds.get(0);
CustomFieldIssuesExample example = new CustomFieldIssuesExample();
example.createCriteria().andFieldIdEqualTo(customFieldId).andResourceIdIn(issueIds);
List<CustomFieldIssues> customFieldIssues = customFieldIssuesMapper.selectByExample(example);
Map<String, String> statusMap = customFieldIssues.stream().collect(Collectors.toMap(CustomFieldIssues::getResourceId, CustomFieldIssues::getValue));
if (MapUtils.isEmpty(statusMap)) {
return;
}
for (IssuesDao issue : issues) {
issue.setStatus(statusMap.getOrDefault(issue.getId(), "").replaceAll("\"", ""));
}
}
public IssuesWithBLOBs getIssue(String id) {
IssuesDao issuesWithBLOBs = extIssuesMapper.selectByPrimaryKey(id);
IssuesRequest issuesRequest = new IssuesRequest();

2
test-track/frontend/src/api/issue.js
View File

@ -25,7 +25,7 @@ export function deleteIssue(id) {
}
export function issueStatusChange(param) {
return get(BASE_URL + 'change/status', param);
return post(BASE_URL + 'change/status', param);
}
export function saveOrUpdateIssue(url, param) {