diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/tasktask/controller/TaskTaskController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/tasktask/controller/TaskTaskController.java index d52b703..07a7072 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/tasktask/controller/TaskTaskController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/tasktask/controller/TaskTaskController.java @@ -240,6 +240,23 @@ public class TaskTaskController extends JeecgController deletePendingTask(@RequestParam("taskId") String taskId) { + if (oConvertUtils.isEmpty(taskId)) { + return Result.error("任务ID不能为空"); + } + if (taskTaskService.deletePendingTask(taskId)) { + return Result.OK("删除待处理任务成功"); + } + return Result.error("删除待处理任务失败"); + } + /** * 导出excel * diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/tasktask/service/ITaskTaskService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/tasktask/service/ITaskTaskService.java index ad36ed7..fae4eaa 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/tasktask/service/ITaskTaskService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/tasktask/service/ITaskTaskService.java @@ -19,4 +19,5 @@ public interface ITaskTaskService extends IService { IPage getTaskTaskPageByBusinessId(Page page, String businessId) throws Exception; boolean updateDeptHandlerName(String processInstanceId, String deptHandlerName); boolean deleteSingleProcess(String processInstId); + boolean deletePendingTask(String taskId); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/tasktask/service/impl/TaskTaskServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/tasktask/service/impl/TaskTaskServiceImpl.java index 08f2aec..7494062 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/tasktask/service/impl/TaskTaskServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/tasktask/service/impl/TaskTaskServiceImpl.java @@ -215,4 +215,21 @@ public class TaskTaskServiceImpl extends ServiceImpl i .eq(TaskTask::getProcessInstId, processInstId); return this.remove(deleteWrapper); } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean deletePendingTask(String taskId) { + TaskTask taskTask = this.getById(taskId); + if (taskTask == null) { + log.warn("【督办-删除待发起任务】未找到tasktask记录, taskId: {}", taskId); + return false; + } + if (org.apache.commons.lang.StringUtils.isNotBlank(taskTask.getProcessInstId())) { + log.warn("【督办-删除待发起任务】任务已有流程实例,拒绝通过本接口删除, taskId: {}, processInstId: {}", taskId, taskTask.getProcessInstId()); + return false; + } + this.removeById(taskId); + log.info("【督办-删除待发起任务】已逻辑删除待发起的任务记录, taskId: {}", taskId); + return true; + } }