From 097dac13af2b91fb2b7a057bcf15e3f0dc1e7cc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E4=BC=9F?= <421281095@qq.com>
Date: Thu, 5 Feb 2026 16:25:17 +0800
Subject: [PATCH] =?UTF-8?q?feat(workflow):=20=E6=B7=BB=E5=8A=A0=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E9=A1=B9ID=E5=AD=97=E6=AE=B5=E5=B9=B6=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E6=B5=81=E7=A8=8B=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在FlowQuerySingleResultDto中添加workitemId字段
- 移除未使用的命名空间引用
- 更新处理工作项注释，增加驳回功能说明
- 添加开始节点无ToDo的注释说明
- 完善工作项处理逻辑，支持通过和驳回两种审核结果
- 修复汇总节点名称从"汇总"改为"汇总判断"
- 在查询单个流程结果时设置workitemId值
- 添加关于流程及个人处理状态处置的TODO注释
---
 OpenAuth.App/workflow/ApiResult.cs            |  1 +
 OpenAuth.App/workflow/WorkflowEngineApp.cs    | 68 +++++++++++--------
 .../CustomWorkflowController.cs               |  8 +--
 3 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/OpenAuth.App/workflow/ApiResult.cs b/OpenAuth.App/workflow/ApiResult.cs
index b4c574a..6735e5a 100644
--- a/OpenAuth.App/workflow/ApiResult.cs
+++ b/OpenAuth.App/workflow/ApiResult.cs
@@ -82,6 +82,7 @@ public class PageQueryRequestDto : PageReq
 /// </summary>
 public class FlowQuerySingleResultDto
 {
+    public long workitemId;
     /// <summary>
     /// 流程实例ID（唯一标识该流程实例，用于后续操作）
     /// </summary>
diff --git a/OpenAuth.App/workflow/WorkflowEngineApp.cs b/OpenAuth.App/workflow/WorkflowEngineApp.cs
index 95ceedb..4160e42 100644
--- a/OpenAuth.App/workflow/WorkflowEngineApp.cs
+++ b/OpenAuth.App/workflow/WorkflowEngineApp.cs
@@ -91,6 +91,7 @@ public class WorkflowEngineApp : SqlSugarBaseApp<SysCategoryType, SugarDbContext
             };
             instanceId = _sqlSugar.Insertable(flowInstance).ExecuteReturnIdentity();
             // 步骤4：插入开始节点工作项（直接标记为已完成）
+            // 开始节点无ToDo
             var startWorkitem = new ZyFlowWorkitem
             {
                 InstanceId = instanceId,
@@ -198,39 +199,47 @@ public class WorkflowEngineApp : SqlSugarBaseApp<SysCategoryType, SugarDbContext
             if (flowInstance == null || currentNode == null)
                 throw new Exception("流程实例或流程节点不存在");
 
-            // 步骤3：更新当前工作项为已完成
-            workitem.Status = "Done";
-            workitem.HandleTime = DateTime.Now;
-            workitem.Comment = string.IsNullOrEmpty(requestDto.Comment) ? "处理完成" : requestDto.Comment;
-            _sqlSugar.Updateable(workitem).ExecuteCommand();
-
-            // 步骤4：按节点类型分支处理核心逻辑
-            switch (currentNode.NodeType)
+            if (requestDto.AuditResult is "Pass")
             {
-                // 普通节点：执法监督科转发
-                case "Common" when currentNode.NodeName == "执法监督科转发":
-                    FlowToNextNode(flowInstance.InstanceId, currentNode, userId, userName, workitem.Comment);
-                    break;
+                // 步骤3：更新当前工作项为已完成
+                workitem.Status = "Done";
+                workitem.HandleTime = DateTime.Now;
+                workitem.Comment = string.IsNullOrEmpty(requestDto.Comment) ? "处理完成" : requestDto.Comment;
+                _sqlSugar.Updateable(workitem).ExecuteCommand();
 
-                // 并行节点：5个审核科会签
-                case "Parallel" when _auditDeptRoleIds.Contains(currentNode.RoleId):
-                    ProcessParallelAudit(flowInstance.InstanceId, currentNode.NodeId, userId, userName, requestDto);
-                    break;
+                // 生成下一节点数据
+                // 步骤4：按节点类型分支处理核心逻辑
+                switch (currentNode.NodeType)
+                {
+                    // 普通节点：执法监督科转发
+                    case "Common" when currentNode.NodeName == "执法监督科转发":
+                        FlowToNextNode(flowInstance.InstanceId, currentNode, userId, userName, workitem.Comment);
+                        break;
 
-                // 分支节点：汇总（归档/退回区县）
-                case "Branch" when currentNode.NodeName == "汇总":
-                    ProcessSummaryNode(flowInstance, currentNode, userId, userName);
-                    break;
+                    // 并行节点：5个审核科会签 // todo 
+                    case "Parallel" when _auditDeptRoleIds.Contains(currentNode.RoleId):
+                        ProcessParallelAudit(flowInstance.InstanceId, currentNode.NodeId, userId, userName, requestDto);
+                        break;
 
-                // 结束节点：流程归档完成
-                case "End":
-                    CompleteFlowInstance(flowInstance);
-                    break;
+                    // 分支节点：汇总（归档/退回区县）
+                    case "Branch" when currentNode.NodeName == "汇总判断":
+                        ProcessSummaryNode(flowInstance, currentNode, userId, userName);
+                        break;
+
+                    // 结束节点：流程归档完成
+                    case "End":
+                        CompleteFlowInstance(flowInstance);
+                        break;
+                }
+
+                // 提交事务
+                UnitWork.Db.Ado.CommitTran();
+                return true;
+            }
+            else // Reject todo 考虑驳回之后，怎么回到上一个节点
+            {
+                return true;
             }
-
-            // 提交事务
-            UnitWork.Db.Ado.CommitTran();
-            return true;
         }
         catch (Exception ex)
         {
@@ -258,7 +267,7 @@ public class WorkflowEngineApp : SqlSugarBaseApp<SysCategoryType, SugarDbContext
         pageQueryDto = pageQueryDto ?? new PageQueryRequestDto();
         var pageIndex = pageQueryDto.page < 1 ? 1 : pageQueryDto.page;
         var pageSize = pageQueryDto.limit < 1 ? 10 : pageQueryDto.limit;
-        
+
         // 拟办不应该是针对个人的吗？
         // 拟办逻辑：工作项状态为"Draft"（拟办）、对应角色匹配当前用户、未分配具体处理人
         var draftQuery = _sqlSugar
@@ -356,6 +365,7 @@ public class WorkflowEngineApp : SqlSugarBaseApp<SysCategoryType, SugarDbContext
             var type = zyflowVarList.Where(v => v.VarKey == "Type").First()?.VarValue;
             dataList.Add(new FlowQuerySingleResultDto
             {
+                workitemId = workitem.WorkitemId,
                 InstanceId = flowInstance.InstanceId,
                 BusinessNo = flowInstance.BusinessNo,
                 Title = flowTitle,
diff --git a/OpenAuth.WebApi/Controllers/ServerController/CustomWorkflowController.cs b/OpenAuth.WebApi/Controllers/ServerController/CustomWorkflowController.cs
index 15c345e..9a13a69 100644
--- a/OpenAuth.WebApi/Controllers/ServerController/CustomWorkflowController.cs
+++ b/OpenAuth.WebApi/Controllers/ServerController/CustomWorkflowController.cs
@@ -1,14 +1,10 @@
 using Microsoft.AspNetCore.Mvc;
 using OpenAuth.App.Interface;
 using OpenAuth.App.workflow;
-using OpenAuth.Repository.Domain;
-using OpenAuth.Repository.Domain.workflow;
 
 namespace OpenAuth.WebApi.Controllers.ServerController;
 
-using Microsoft.AspNetCore.Mvc;
-using OpenAuth.App.Interface;
-
+// todo 关于针对流程及个人的处理状态处置
 /// <summary>
 /// 工作流核心API接口（流程发起/处理 + 拟办/待办/已办/未办结/已完成/全部事项查询）
 /// </summary>
@@ -58,7 +54,7 @@ public class WorkflowController : ControllerBase
     }
 
     /// <summary>
-    /// 处理工作项（执法监督科转发/审核科会签/汇总处理）
+    /// 处理工作项（执法监督科转发/审核科会签/汇总处理 todo 驳回）
     /// </summary>
     /// <param name="requestDto">处理工作项请求参数</param>
     /// <returns>处理结果</returns>