diff --git a/backend/src/main/java/io/metersphere/track/controller/IssuesController.java b/backend/src/main/java/io/metersphere/track/controller/IssuesController.java index e61fd3e53a..73ac8a6bac 100644 --- a/backend/src/main/java/io/metersphere/track/controller/IssuesController.java +++ b/backend/src/main/java/io/metersphere/track/controller/IssuesController.java @@ -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}") diff --git a/backend/src/main/java/io/metersphere/track/service/IssuesService.java b/backend/src/main/java/io/metersphere/track/service/IssuesService.java index 3c92766d75..559d002cac 100644 --- a/backend/src/main/java/io/metersphere/track/service/IssuesService.java +++ b/backend/src/main/java/io/metersphere/track/service/IssuesService.java @@ -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 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 getZentaoBuilds(IssuesRequest request) { try { ZentaoPlatform platform = (ZentaoPlatform) IssueFactory.createPlatform(IssuesManagePlatform.Zentao.name(), request); diff --git a/frontend/src/business/components/project/notification/track/TestPlanTaskNotification.vue b/frontend/src/business/components/project/notification/track/TestPlanTaskNotification.vue index f3f698e9c0..304f0b0144 100644 --- a/frontend/src/business/components/project/notification/track/TestPlanTaskNotification.vue +++ b/frontend/src/business/components/project/notification/track/TestPlanTaskNotification.vue @@ -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', diff --git a/frontend/src/business/components/track/plan/components/ScheduleNotification.vue b/frontend/src/business/components/track/plan/components/ScheduleNotification.vue index c28c24d68e..5b81b533cc 100644 --- a/frontend/src/business/components/track/plan/components/ScheduleNotification.vue +++ b/frontend/src/business/components/track/plan/components/ScheduleNotification.vue @@ -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',