From 3bffc16f9d3f155575f3de3c1f8b022ce1431c7e Mon Sep 17 00:00:00 2001 From: wxyclub Date: Thu, 21 Sep 2023 11:48:31 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E7=8A=B6=E6=80=81=EF=BC=8C=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=B7=B2=E6=8E=A5=E6=94=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/TaskController.java | 20 +++++++++++++++++++ .../task/TodoTaskController.java | 6 ++++++ .../datas/entity/BusProcessNew.java | 5 +++++ 3 files changed, 31 insertions(+) diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java index 602178f3..aec00b87 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java @@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.business_activiti.task; import java.text.SimpleDateFormat; import java.util.*; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; import com.ydw.bat.wkflow.business_main.datas.entity.*; @@ -176,6 +177,25 @@ public class TaskController { } }); } + // 将节点完成状态添加到返回的Map集合中 + for (Map historyTaskMap : list) { + String processInstanceId = (String) historyTaskMap.get("processInstanceId"); + if (StringUtils.isBlank(processInstanceId)) { + continue; + } + // 查询节点完成状态 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(BusProcessNew::getPId, processInstanceId); + wrapper.isNotNull(BusProcessNew::getTaskId); + wrapper.eq(BusProcessNew::getReceiveStatus,"已接收"); + wrapper.select(BusProcessNew::getTaskId, BusProcessNew::getReceiveStatus); + List busProcessNewList = iBusProcessNewService.list(wrapper); + for (BusProcessNew busProcessNew : busProcessNewList) { + if (busProcessNew.getTaskId().equals(historyTaskMap.get("id"))) { + historyTaskMap.put("receiveStatus",busProcessNew.getReceiveStatus()); + } + } + } return list; } @ApiOperation(value = "流程实例汇总列表") 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 cfecb7a2..e3b6f4af 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 @@ -6,6 +6,7 @@ import java.util.*; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.serializer.SerializerFeature; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.tmsps.fk.common.util.JsonUtil; import com.ydw.bat.wkflow.business_activiti.dto.*; import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; @@ -762,6 +763,11 @@ 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); return processNew; } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/BusProcessNew.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/BusProcessNew.java index d41e1fe9..32d9a538 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/BusProcessNew.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/BusProcessNew.java @@ -120,4 +120,9 @@ public class BusProcessNew implements Serializable { @TableField( exist = false) @ApiModelProperty(value = "当前节点信息") private String nowTaskInfo; + + @TableField("RECEIVE_STATUS") + @ApiModelProperty("接收状态") + private String receiveStatus; + }