From 113c68f82433ce8cd792059799f144841cb6a4e4 Mon Sep 17 00:00:00 2001
From: aikai <ZZL86tdd>
Date: Fri, 27 Jun 2025 16:13:54 +0800
Subject: [PATCH] =?UTF-8?q?feat(bpm):=20=E4=BC=98=E5=8C=96=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=AE=9A=E4=B9=89=E5=88=97=E8=A1=A8=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=B9=B6=E6=B7=BB=E5=8A=A0=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=BB=93=E6=9E=9C=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 BpmProcessDefinitionController 中增加对 "work_order" 流程定义的过滤- 在 BpmOAWorkOrderUpdateReqVO 中添加 result 字段，用于 BPM 流程结果
- 在 BpmOAWorkOrderServiceImpl 中处理更新工单的 result 字段
---
 .../admin/definition/BpmProcessDefinitionController.java    | 2 +-
 .../admin/oa/vo/workorder/BpmOAWorkOrderUpdateReqVO.java    | 6 +++++-
 .../module/bpm/service/oa/BpmOAWorkOrderServiceImpl.java    | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java
index c583d12b..5ea185af 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java
@@ -44,7 +44,7 @@ public class BpmProcessDefinitionController {
             BpmProcessDefinitionListReqVO listReqVO) {
 
         List<BpmProcessDefinitionRespVO> respVOS = bpmDefinitionService.getProcessDefinitionList(listReqVO);
-        respVOS = respVOS.stream().filter(data -> !data.getId().contains("work_task")).collect(Collectors.toList());
+        respVOS = respVOS.stream().filter(data -> !(data.getId().contains("work_task") || data.getId().contains("work_order"))).collect(Collectors.toList());
         return success(respVOS);
     }
 
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/workorder/BpmOAWorkOrderUpdateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/workorder/BpmOAWorkOrderUpdateReqVO.java
index ccad5d6a..5922141f 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/workorder/BpmOAWorkOrderUpdateReqVO.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/workorder/BpmOAWorkOrderUpdateReqVO.java
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.workorder;
 
+import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -20,6 +21,9 @@ public class BpmOAWorkOrderUpdateReqVO {
     @Schema(description = "工单状态", example = "3")
     private Integer status;
 
+    @Schema(description = "BPM流程结果", example = "3")
+    private Integer result;
+
     @Schema(description = "期望完成时间", example = "2024-12-20 18:00:00")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime expectedTime;
@@ -31,4 +35,4 @@ public class BpmOAWorkOrderUpdateReqVO {
     @Schema(description = "工单处理结果说明", example = "已成功修复系统登录问题，用户可以正常登录")
     private String resultDescription;
 
-} 
\ No newline at end of file
+}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAWorkOrderServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAWorkOrderServiceImpl.java
index 949e807b..86f55f79 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAWorkOrderServiceImpl.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAWorkOrderServiceImpl.java
@@ -164,6 +164,7 @@ public class BpmOAWorkOrderServiceImpl extends BpmOABaseService implements BpmOA
         BpmOAWorkOrderDO updateData = BpmOAWorkOrderDO.builder()
                 .id(updateReqVO.getId())
                 .status(updateReqVO.getStatus())
+                .result(updateReqVO.getResult())
                 .expectedTime(updateReqVO.getExpectedTime())
                 .completedTime(updateReqVO.getCompletedTime())
                 .resultDescription(updateReqVO.getResultDescription())