From 1eee3290fe1157f4d9084171c6fa4b5640f8a665 Mon Sep 17 00:00:00 2001
From: mhsnet <mhsnet@163.com>
Date: Thu, 22 Feb 2024 14:01:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E6=B5=81=E7=A8=8B=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7=E5=BD=92=E6=A1=A3=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/jnpf/engine/service/impl/FlowTaskServiceImpl.java  | 6 ++++++
 .../java/jnpf/engine/model/flowtask/PaginationFlowTask.java | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/jnpf-java-boot/jnpf-workflow/jnpf-workflow-engine/jnpf-workflow-engine-biz/src/main/java/jnpf/engine/service/impl/FlowTaskServiceImpl.java b/jnpf-java-boot/jnpf-workflow/jnpf-workflow-engine/jnpf-workflow-engine-biz/src/main/java/jnpf/engine/service/impl/FlowTaskServiceImpl.java
index 17ee2fe2..735df228 100644
--- a/jnpf-java-boot/jnpf-workflow/jnpf-workflow-engine/jnpf-workflow-engine-biz/src/main/java/jnpf/engine/service/impl/FlowTaskServiceImpl.java
+++ b/jnpf-java-boot/jnpf-workflow/jnpf-workflow-engine/jnpf-workflow-engine-biz/src/main/java/jnpf/engine/service/impl/FlowTaskServiceImpl.java
@@ -119,6 +119,12 @@ public class FlowTaskServiceImpl extends SuperServiceImpl<FlowTaskMapper, FlowTa
             flag = true;
             queryWrapper.lambda().eq(FlowTaskEntity::getStatus, status);
         }
+        //流程状态
+        Integer completion = paginationFlowTask.getCompletion() != null ? paginationFlowTask.getCompletion() : null;
+        if (ObjectUtil.isNotEmpty(completion)) {
+            flag = true;
+            queryWrapper.lambda().eq(FlowTaskEntity::getCompletion, completion);
+        }
         //流程模板
         String templateId = paginationFlowTask.getTemplateId() != null ? paginationFlowTask.getTemplateId() : null;
         if (ObjectUtil.isNotEmpty(templateId)) {
diff --git a/jnpf-java-boot/jnpf-workflow/jnpf-workflow-engine/jnpf-workflow-engine-entity/src/main/java/jnpf/engine/model/flowtask/PaginationFlowTask.java b/jnpf-java-boot/jnpf-workflow/jnpf-workflow-engine/jnpf-workflow-engine-entity/src/main/java/jnpf/engine/model/flowtask/PaginationFlowTask.java
index 4c0df557..d572a457 100644
--- a/jnpf-java-boot/jnpf-workflow/jnpf-workflow-engine/jnpf-workflow-engine-entity/src/main/java/jnpf/engine/model/flowtask/PaginationFlowTask.java
+++ b/jnpf-java-boot/jnpf-workflow/jnpf-workflow-engine/jnpf-workflow-engine-entity/src/main/java/jnpf/engine/model/flowtask/PaginationFlowTask.java
@@ -29,6 +29,8 @@ public class PaginationFlowTask extends PaginationTime {
     private String creatorUserId;
     @Schema(description ="状态")
     private Integer status;
+    @Schema(description ="完成情况")
+    private Integer completion;
     @Schema(description ="批量审批",hidden = true)
     @JsonIgnore
     private Integer isBatch;