diff --git a/CarbonSysBE1/src/main/java/edu/ncst/carbon/controller/task/TaskAuditController.java b/CarbonSysBE1/src/main/java/edu/ncst/carbon/controller/task/TaskAuditController.java index eb8ada5..3aa1a5d 100644 --- a/CarbonSysBE1/src/main/java/edu/ncst/carbon/controller/task/TaskAuditController.java +++ b/CarbonSysBE1/src/main/java/edu/ncst/carbon/controller/task/TaskAuditController.java @@ -130,13 +130,4 @@ public class TaskAuditController { return ResultUtils.success("ok", result); } - @ApiOperation("用户确认审核任务") - @PostMapping("/confirm") - public ResultVO confirmAudit( @RequestParam Integer taskAuditId) { - - TaskAudit result = taskAuditService.confirmAudit(taskAuditId); - - return ResultUtils.success("ok", result); - } - } diff --git a/CarbonSysBE1/src/main/java/edu/ncst/carbon/model/task/TaskAudit.java b/CarbonSysBE1/src/main/java/edu/ncst/carbon/model/task/TaskAudit.java index a522dde..68200d0 100644 --- a/CarbonSysBE1/src/main/java/edu/ncst/carbon/model/task/TaskAudit.java +++ b/CarbonSysBE1/src/main/java/edu/ncst/carbon/model/task/TaskAudit.java @@ -53,5 +53,8 @@ public class TaskAudit implements Serializable { @ApiModelProperty(value = "审批状态:待审核 1 审核通过 2 审核未通过 3 完成 0") private String status; + @ApiModelProperty(value = "任务类型") + private String taskName; + private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/CarbonSysBE1/src/main/java/edu/ncst/carbon/service/ITaskAuditService.java b/CarbonSysBE1/src/main/java/edu/ncst/carbon/service/ITaskAuditService.java index 4358f5a..ff6d0f2 100644 --- a/CarbonSysBE1/src/main/java/edu/ncst/carbon/service/ITaskAuditService.java +++ b/CarbonSysBE1/src/main/java/edu/ncst/carbon/service/ITaskAuditService.java @@ -28,5 +28,4 @@ public interface ITaskAuditService extends IService{ TaskAudit audit(Integer taskAuditId, Boolean yesNo); - TaskAudit confirmAudit(Integer taskAuditId); } diff --git a/CarbonSysBE1/src/main/java/edu/ncst/carbon/service/impl/task/TaskAuditServiceImpl.java b/CarbonSysBE1/src/main/java/edu/ncst/carbon/service/impl/task/TaskAuditServiceImpl.java index 4e2fad1..b828369 100644 --- a/CarbonSysBE1/src/main/java/edu/ncst/carbon/service/impl/task/TaskAuditServiceImpl.java +++ b/CarbonSysBE1/src/main/java/edu/ncst/carbon/service/impl/task/TaskAuditServiceImpl.java @@ -193,6 +193,7 @@ public class TaskAuditServiceImpl extends ServiceImpl