From d656ce270db83732a7181679eb6b1cbfd90f580e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 26 三月 2025 19:19:23 +0800
Subject: [PATCH] xiugai

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java
index cbefcad..e17245c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java
@@ -1003,7 +1003,11 @@
         Long taskId = Long.valueOf(processRefuseBO.getTaskId());
         FlwTask flwTask = flwTaskMapper.selectById(taskId);
         // 直接拒绝当前流程
-        flowLongEngine.runtimeService().reject(flwTask.getInstanceId(), currentFlowCreator());
+        try{
+//            flowLongEngine.runtimeService().reject(flwTask.getInstanceId(), currentFlowCreator());
+        }catch (Exception e){
+            System.out.println("拒绝流程");
+        }
         // 动作执行记录
         StateProcessInstanceAction record = new StateProcessInstanceAction();
         record.setId(IdUtils.simpleUUID());
@@ -1281,7 +1285,7 @@
 
         // 查询历史任务
         List<FlwHisTask> flwHisTasks = flwHisTaskMapper.selectList(Wrappers.<FlwHisTask>lambdaQuery().eq(FlwHisTask::getInstanceId, instanceId));
-
+        processDetailVO.setInstanceId(String.valueOf(instanceId));
         processDetailVO.setFlwHisTasks(flwHisTasks);
 
         List<StateProcessInstanceAction> list = stateProcessInstanceActionService.list(Wrappers.<StateProcessInstanceAction>lambdaQuery().eq(StateProcessInstanceAction::getInstanceId, instanceId)
@@ -1365,6 +1369,7 @@
             sysUserMap = new HashMap<>();
         }
         for (ProcessTaskListVO processTaskListVO : processTaskListVOS) {
+            processTaskListVO.setStatus(processTaskListVO.getTaskState() == 10 ? "2" : processTaskListVO.getTaskState().toString());
             processTaskListVO.setTaskId(processTaskListVO.getId());
             SysUser sysUser = sysUserMap.get(processTaskListVO.getCreateBy());
             if (Objects.nonNull(sysUser)) {

--
Gitblit v1.7.1