fix(测试计划): 去掉测试计划通知模版中无用的值

--bug=1015727 --user=刘瑞斌 【测试计划】定时任务通知模板中变量名${executionTimes}没有删掉和测试用例匹配规则 ${testCaseMatchRule} 参数取不到值 https://www.tapd.cn/55049933/s/1224099
This commit is contained in:
CaptainB 2022-08-19 13:04:48 +08:00 committed by f2c-ci-robot[bot]
parent e5ffb7e295
commit d509425131
4 changed files with 7 additions and 36 deletions

View File

@ -62,8 +62,7 @@ public class IssuesController {
@PostMapping("/add")
@RequiresPermissions(PermissionConstants.PROJECT_TRACK_ISSUE_READ_CREATE)
@MsAuditLog(module = OperLogModule.TRACK_BUG, type = OperLogConstants.CREATE, content = "#msClass.getLogDetails(#issuesRequest)", msClass = IssuesService.class)
@SendNotice(taskType = NoticeConstants.TaskType.DEFECT_TASK, target = "#issuesRequest",
event = NoticeConstants.Event.CREATE, subject = "缺陷通知")
@SendNotice(taskType = NoticeConstants.TaskType.DEFECT_TASK, event = NoticeConstants.Event.CREATE, subject = "缺陷通知")
public IssuesWithBLOBs addIssues(@RequestBody IssuesUpdateRequest issuesRequest) {
return issuesService.addIssues(issuesRequest);
}
@ -71,10 +70,9 @@ public class IssuesController {
@PostMapping("/update")
@RequiresPermissions(PermissionConstants.PROJECT_TRACK_ISSUE_READ_EDIT)
@MsAuditLog(module = OperLogModule.TRACK_BUG, type = OperLogConstants.UPDATE, beforeEvent = "#msClass.getLogDetails(#issuesRequest.id)", content = "#msClass.getLogDetails(#issuesRequest.id)", msClass = IssuesService.class)
@SendNotice(taskType = NoticeConstants.TaskType.DEFECT_TASK, target = "#issuesRequest",
event = NoticeConstants.Event.UPDATE, subject = "缺陷通知")
public void updateIssues(@RequestBody IssuesUpdateRequest issuesRequest) {
issuesService.updateIssues(issuesRequest);
@SendNotice(taskType = NoticeConstants.TaskType.DEFECT_TASK, event = NoticeConstants.Event.UPDATE, subject = "缺陷通知")
public IssuesWithBLOBs updateIssues(@RequestBody IssuesUpdateRequest issuesRequest) {
return issuesService.updateIssues(issuesRequest);
}
@GetMapping("/get/case/{refType}/{id}")

View File

@ -108,16 +108,17 @@ public class IssuesService {
});
}
saveFollows(issuesRequest.getId(), issuesRequest.getFollows());
return issues;
return getIssue(issues.getId());
}
public void updateIssues(IssuesUpdateRequest issuesRequest) {
public IssuesWithBLOBs updateIssues(IssuesUpdateRequest issuesRequest) {
issuesRequest.getId();
List<AbstractIssuePlatform> platformList = getUpdatePlatforms(issuesRequest);
platformList.forEach(platform -> {
platform.updateIssue(issuesRequest);
});
return getIssue(issuesRequest.getId());
// todo 缺陷更新事件
}
@ -351,10 +352,6 @@ public class IssuesService {
platform.deleteIssue(id);
}
public IssuesWithBLOBs get(String id) {
return issuesMapper.selectByPrimaryKey(id);
}
public List<ZentaoBuild> getZentaoBuilds(IssuesRequest request) {
try {
ZentaoPlatform platform = (ZentaoPlatform) IssueFactory.createPlatform(IssuesManagePlatform.Zentao.name(), request);

View File

@ -195,14 +195,6 @@ export default {
label:this.$t('test_track.plan.plan_stage'),
value:'stage',
},
{
label:this.$t('test_track.case.match_rule'),
value:'testCaseMatchRule',
},
{
label:this.$t('test_track.plan.plan_stage'),
value:'executorMatchRule',
},
{
label:this.$t('commons.create_time'),
value:'createTime',
@ -235,10 +227,6 @@ export default {
label:this.$t('project.id'),
value: 'projectId',
},
{
label: this.$t('commons.execution_times'),
value: 'executionTimes',
},
{
label: this.$t('test_track.automatic_status_update'),
value: 'automaticStatusUpdate',

View File

@ -196,14 +196,6 @@ export default {
label:this.$t('test_track.plan.plan_stage'),
value:'stage',
},
{
label:this.$t('test_track.case.match_rule'),
value:'testCaseMatchRule',
},
{
label:this.$t('test_track.plan.plan_stage'),
value:'executorMatchRule',
},
{
label:this.$t('commons.create_time'),
value:'createTime',
@ -236,10 +228,6 @@ export default {
label:this.$t('project.id'),
value: 'projectId',
},
{
label: this.$t('commons.execution_times'),
value: 'executionTimes',
},
{
label: this.$t('test_track.automatic_status_update'),
value: 'automaticStatusUpdate',