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:
chenjianxing 2021-10-26 10:42:30 +08:00 committed by jianxing
parent 238f482862
commit d5ee714bea
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
backend/src/main/java/io/metersphere/track/service/IssuesService.java
View File

@ -86,7 +86,7 @@ public class IssuesService {
public void addIssues(IssuesUpdateRequest issuesRequest) { public void addIssues(IssuesUpdateRequest issuesRequest) {
List<AbstractIssuePlatform> platformList = getUpdatePlatforms(issuesRequest); List<AbstractIssuePlatform> platformList = getAddPlatforms(issuesRequest);
platformList.forEach(platform -> { platformList.forEach(platform -> {
platform.addIssue(issuesRequest); platform.addIssue(issuesRequest);
}); });
@ -97,6 +97,7 @@ public class IssuesService {
public void updateIssues(IssuesUpdateRequest issuesRequest) { public void updateIssues(IssuesUpdateRequest issuesRequest) {
issuesRequest.getId();
List<AbstractIssuePlatform> platformList = getUpdatePlatforms(issuesRequest); List<AbstractIssuePlatform> platformList = getUpdatePlatforms(issuesRequest);
platformList.forEach(platform -> { platformList.forEach(platform -> {
platform.updateIssue(issuesRequest); platform.updateIssue(issuesRequest);
@ -104,7 +105,7 @@ public class IssuesService {
// todo 缺陷更新事件？ // todo 缺陷更新事件？
} }
public List<AbstractIssuePlatform> getUpdatePlatforms(IssuesUpdateRequest updateRequest) { public List<AbstractIssuePlatform> getAddPlatforms(IssuesUpdateRequest updateRequest) {
List<String> platforms = new ArrayList<>(); List<String> platforms = new ArrayList<>();
if (StringUtils.isNotBlank(updateRequest.getTestCaseId())) { if (StringUtils.isNotBlank(updateRequest.getTestCaseId())) {
// 测试计划关联 // 测试计划关联
@ -124,6 +125,21 @@ public class IssuesService {
return IssueFactory.createPlatforms(platforms, issuesRequest); return IssueFactory.createPlatforms(platforms, issuesRequest);
} }
public List<AbstractIssuePlatform> getUpdatePlatforms(IssuesUpdateRequest updateRequest) {
String id = updateRequest.getId();
IssuesWithBLOBs issuesWithBLOBs = issuesMapper.selectByPrimaryKey(id);
String platform = issuesWithBLOBs.getPlatform();
List<String> platforms = new ArrayList<>();
if (StringUtils.isBlank(platform)) {
platforms.add(IssuesManagePlatform.Local.toString());
} else {
platforms.add(platform);
}
IssuesRequest issuesRequest = new IssuesRequest();
BeanUtils.copyBean(issuesRequest, updateRequest);
return IssueFactory.createPlatforms(platforms, issuesRequest);
}
public List<IssuesDao> getIssues(String caseId) { public List<IssuesDao> getIssues(String caseId) {
IssuesRequest issueRequest = new IssuesRequest(); IssuesRequest issueRequest = new IssuesRequest();
issueRequest.setTestCaseId(caseId); issueRequest.setTestCaseId(caseId);