From 53b0e6ed871be3c4d5864c024490bb4d8910b337 Mon Sep 17 00:00:00 2001
From: Echo <4759156@qq.com>
Date: Wed, 26 Mar 2025 16:18:29 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=9B=9B=EF=BC=9A=20?=
 =?UTF-8?q?=E6=9C=80=E7=BB=88=E7=9A=84=E7=BB=93=E6=9E=9C=20=20=E8=83=BD?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=87=BA=E6=9D=A5=E5=9C=A8=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E3=80=82=EF=BC=88=E5=A6=82=E8=B4=A2=E5=8A=A1?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E9=80=9A=E8=BF=87=E4=BA=86=EF=BC=8C=E4=BA=8B?=
 =?UTF-8?q?=E5=90=8E=E5=8F=91=E8=B5=B7=E4=BA=BA=E5=8F=88=E8=87=AA=E8=A1=8C?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E4=BA=86=E6=B5=81=E7=A8=8B=EF=BC=8C=E5=9C=A8?=
 =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E8=BF=99=E8=BE=B9=E5=B0=B1=E7=9C=8B=E4=B8=8D?=
 =?UTF-8?q?=E5=88=B0=E8=BF=99=E4=B8=AA=E5=8D=95=E5=AD=90=E6=98=AF=E5=B7=B2?=
 =?UTF-8?q?=E7=BB=8F=E8=A2=AB=E5=8F=96=E6=B6=88=E4=BA=86=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/task/vo/task/BpmTaskDonePageRespVO.java  | 4 ++++
 .../yudao/module/bpm/dal/mysql/task/BpmTaskExtMapper.java     | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskDonePageRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskDonePageRespVO.java
index 1f26fcf9..7212e277 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskDonePageRespVO.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskDonePageRespVO.java
@@ -24,6 +24,10 @@ public class BpmTaskDonePageRespVO {
     @Schema(description = "任务结果-参见 bpm_process_instance_result", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     private Integer result;
 
+    @Schema(description = "任务结果-参见 bpm_process_instance_status", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    private Integer status;
+
+
     @Schema(description = "审批建议", requiredMode = Schema.RequiredMode.REQUIRED, example = "不请假了！")
     private String reason;
 
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/task/BpmTaskExtMapper.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/task/BpmTaskExtMapper.java
index 172bea01..73c336b7 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/task/BpmTaskExtMapper.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/task/BpmTaskExtMapper.java
@@ -93,6 +93,7 @@ public interface BpmTaskExtMapper extends BaseMapperX<BpmTaskExtDO> {
         queryWrapperX.selectAs(BpmProcessInstanceExtDO::getStartUserId, BpmTaskDonePageRespVO::getStartUserId);
         queryWrapperX.selectAs(BpmProcessInstanceExtDO::getProcessDefinitionId, BpmTaskDonePageRespVO::getProcessDefinitionId);
         queryWrapperX.selectAs(BpmProcessInstanceExtDO::getCcids, BpmTaskDonePageRespVO::getCcUserIds);
+        queryWrapperX.selectAs(BpmProcessInstanceExtDO::getResult, BpmTaskDonePageRespVO::getStatus ) ;
 
         queryWrapperX.innerJoin(BpmProcessInstanceExtDO.class, on -> on
                 .eq(BpmTaskExtDO::getProcessInstanceId, BpmProcessInstanceExtDO::getProcessInstanceId)
@@ -101,6 +102,7 @@ public interface BpmTaskExtMapper extends BaseMapperX<BpmTaskExtDO> {
         queryWrapperX.likeRight(BpmProcessInstanceExtDO::getProcessDefinitionId, "oa_");
         queryWrapperX.eq(BpmTaskExtDO::getAssigneeUserId, userId);
         queryWrapperX.ne(BpmTaskExtDO::getReason, BpmConstants.AUTO_APPRAVAL);
+        queryWrapperX.ne(BpmTaskExtDO::getResult,4); //还未开始审批，发起人主动撤销的流程，不显示
         queryWrapperX.betweenIfPresent(BpmTaskExtDO::getCreateTime, pageVO.getCreateTime());
         queryWrapperX.orderByDesc(BpmTaskExtDO::getEndTime);