From d1373089bfd6976a9b8c3b7d7fddbb09afd7b340 Mon Sep 17 00:00:00 2001 From: zhihao <18915542763@163.com> Date: Thu, 2 Jul 2026 10:05:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?czh-20260702-=E6=96=B0=E5=A2=9EdeletePendin?= =?UTF-8?q?gTask=E6=8E=A5=E5=8F=A3=E6=94=AF=E6=8C=81=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=9C=AA=E5=8F=91=E8=B5=B7=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.7 --- .../tasktask/controller/TaskTaskController.java | 17 +++++++++++++++++ .../tasktask/service/ITaskTaskService.java | 1 + .../service/impl/TaskTaskServiceImpl.java | 17 +++++++++++++++++ 3 files changed, 35 insertions(+) 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; + } } From 7078949de6c788390b48b7d702e6f54413975797 Mon Sep 17 00:00:00 2001 From: zhihao <18915542763@163.com> Date: Thu, 2 Jul 2026 13:36:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?czh-20260702-=E6=96=B0=E5=A2=9EupdateTitleA?= =?UTF-8?q?ndDeadline=E6=8E=A5=E5=8F=A3=E5=90=8C=E6=AD=A5=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E4=B8=AD=E9=97=B4=E8=A1=A8=E4=B8=8E=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.7 --- .../controller/TaskTaskController.java | 25 ++++++++++++++++ .../tasktask/service/ITaskTaskService.java | 1 + .../service/impl/TaskTaskServiceImpl.java | 30 +++++++++++++++++++ 3 files changed, 56 insertions(+) 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 07a7072..4150df0 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 @@ -257,6 +257,31 @@ public class TaskTaskController extends JeecgController updateTitleAndDeadline(@RequestParam("taskId") String taskId, + @RequestParam("title") String title, + @RequestParam("requireFinishDate") String requireFinishDate) { + if (oConvertUtils.isEmpty(taskId)) { + return Result.error("任务ID不能为空"); + } + if (oConvertUtils.isEmpty(title)) { + return Result.error("标题不能为空"); + } + if (oConvertUtils.isEmpty(requireFinishDate)) { + return Result.error("要求完成日期不能为空"); + } + if (taskTaskService.updateTitleAndDeadline(taskId, title, requireFinishDate)) { + 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 fae4eaa..907ba29 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 @@ -20,4 +20,5 @@ public interface ITaskTaskService extends IService { boolean updateDeptHandlerName(String processInstanceId, String deptHandlerName); boolean deleteSingleProcess(String processInstId); boolean deletePendingTask(String taskId); + boolean updateTitleAndDeadline(String taskId, String title, String requireFinishDate); } 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 7494062..6b49eab 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 @@ -232,4 +232,34 @@ public class TaskTaskServiceImpl extends ServiceImpl i log.info("【督办-删除待发起任务】已逻辑删除待发起的任务记录, taskId: {}", taskId); return true; } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean updateTitleAndDeadline(String taskId, String title, String requireFinishDate) { + TaskTask taskTask = this.getById(taskId); + if (taskTask == null) { + log.warn("【督办-修改标题和截止时间】未找到tasktask记录, taskId: {}", taskId); + return false; + } + taskTask.setTitle(title); + taskTask.setRequireFinishDate(java.sql.Date.valueOf(requireFinishDate)); + this.updateById(taskTask); + log.info("【督办-修改标题和截止时间】已更新tasktask表, taskId: {}, title: {}, requireFinishDate: {}", taskId, title, requireFinishDate); + + if (StringUtils.isNotBlank(taskTask.getProcessInstId())) { + try { + runtimeService.setVariable(taskTask.getProcessInstId(), "title", title); + runtimeService.setVariable(taskTask.getProcessInstId(), "deadline", requireFinishDate); + String bizTitle = (String) runtimeService.getVariable(taskTask.getProcessInstId(), "bpm_biz_title"); + if (StringUtils.isNotBlank(bizTitle)) { + String suffix = bizTitle.replaceAll("^.*?(【)", "【"); + runtimeService.setVariable(taskTask.getProcessInstId(), "bpm_biz_title", title + suffix); + } + log.info("【督办-修改标题和截止时间】已更新流程变量, processInstId: {}", taskTask.getProcessInstId()); + } catch (Exception e) { + log.error("【督办-修改标题和截止时间】更新流程变量失败, processInstId: {}", taskTask.getProcessInstId(), e); + } + } + return true; + } }