From 68d164938c65fd29af4673cb7524a3e448a03926 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Thu, 9 May 2024 11:24:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=B5=81=E7=A8=8B=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bat/wkflow/business_activiti/task/TodoTaskController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java index a5ff9088..949efe00 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java @@ -916,6 +916,7 @@ public class TodoTaskController extends BaseAction { LambdaUpdateWrapper bphUpdateWrapper = new LambdaUpdateWrapper<>(); bphUpdateWrapper.in(BusProcessHistory::getTaskId,taskIdList); + bphUpdateWrapper.eq(BusProcessHistory::getTaskStatus, TaskStatusEnum.TODO.getValue()); bphUpdateWrapper.set(BusProcessHistory::getTaskStatus, TaskStatusEnum.RECEIVED.getValue()); this.busProcessHistoryService.update(bphUpdateWrapper); return processNew; From 53525916526161106a1e3195e56aca33534ea798 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Thu, 9 May 2024 17:45:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=B5=81=E7=A8=8B=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business_activiti/task/TodoTaskController.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java index 949efe00..a51baaf6 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java @@ -908,15 +908,15 @@ public class TodoTaskController extends BaseAction { wrapper.eq("EXEC_STATUS",0); long count = oaTaskExecService.count(wrapper); processNew.setCommitStatus(count); - // 设置processNew表流程状态为已接收 - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.in(BusProcessNew::getTaskId,taskIdList); - updateWrapper.set(BusProcessNew::getReceiveStatus,"已接收"); - iBusProcessNewService.update(updateWrapper); + // 设置processNew表流程状态为已接收，已废弃 +// LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); +// updateWrapper.in(BusProcessNew::getTaskId,taskIdList); +// updateWrapper.set(BusProcessNew::getReceiveStatus,"已接收"); +// iBusProcessNewService.update(updateWrapper); LambdaUpdateWrapper bphUpdateWrapper = new LambdaUpdateWrapper<>(); bphUpdateWrapper.in(BusProcessHistory::getTaskId,taskIdList); - bphUpdateWrapper.eq(BusProcessHistory::getTaskStatus, TaskStatusEnum.TODO.getValue()); + bphUpdateWrapper.ne(BusProcessHistory::getTaskStatus, TaskStatusEnum.DONE.getValue()); bphUpdateWrapper.set(BusProcessHistory::getTaskStatus, TaskStatusEnum.RECEIVED.getValue()); this.busProcessHistoryService.update(bphUpdateWrapper); return processNew;