From 11eae587a06ebc604ab76bc50985ff08de6f6798 Mon Sep 17 00:00:00 2001 From: xiarigang <272227118@qq.com> Date: Mon, 28 Apr 2025 12:23:50 +0800 Subject: [PATCH] =?UTF-8?q?[upgrade]=20=E5=8D=87=E7=BA=A7=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=88=B01.7.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 +++--- warm-flow-mybatis-flex-core/pom.xml | 2 +- .../org/dromara/warm/flow/orm/dao/FlowTaskDaoImpl.java | 10 ++++++++++ .../org/dromara/warm/flow/orm/entity/FlowHisTask.java | 2 +- .../org/dromara/warm/flow/orm/entity/FlowInstance.java | 2 +- .../org/dromara/warm/flow/orm/entity/FlowTask.java | 5 +++++ warm-flow-mybatis-flex-sb-starter/pom.xml | 2 +- warm-flow-mybatis-flex-sb3-starter/pom.xml | 2 +- warm-flow-mybatis-flex-solon-plugin/pom.xml | 2 +- 9 files changed, 24 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index cd5d614..eccb9fc 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.dromara.warm-flow-mybatis-flex warm-flow-mybatis-flex - 1.6.9 + 1.7.0 pom warm-flow-mybatis-flex @@ -43,8 +43,8 @@ - 1.6.9 - 1.6.9 + 1.7.0 + 1.7.0 8 diff --git a/warm-flow-mybatis-flex-core/pom.xml b/warm-flow-mybatis-flex-core/pom.xml index ded6534..322faab 100644 --- a/warm-flow-mybatis-flex-core/pom.xml +++ b/warm-flow-mybatis-flex-core/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm-flow-mybatis-flex warm-flow-mybatis-flex - 1.6.9 + 1.7.0 warm-flow-mybatis-flex-core diff --git a/warm-flow-mybatis-flex-core/src/main/java/org/dromara/warm/flow/orm/dao/FlowTaskDaoImpl.java b/warm-flow-mybatis-flex-core/src/main/java/org/dromara/warm/flow/orm/dao/FlowTaskDaoImpl.java index 342c3b4..fb6295b 100644 --- a/warm-flow-mybatis-flex-core/src/main/java/org/dromara/warm/flow/orm/dao/FlowTaskDaoImpl.java +++ b/warm-flow-mybatis-flex-core/src/main/java/org/dromara/warm/flow/orm/dao/FlowTaskDaoImpl.java @@ -15,6 +15,7 @@ */ package org.dromara.warm.flow.orm.dao; +import com.mybatisflex.core.query.QueryWrapper; import org.dromara.warm.flow.core.orm.dao.FlowTaskDao; import org.dromara.warm.flow.core.invoker.FrameInvoker; import org.dromara.warm.flow.orm.entity.FlowTask; @@ -51,4 +52,13 @@ public class FlowTaskDaoImpl extends WarmDaoImpl implements FlowTaskDa return delete(newEntity(), (luw) -> luw.in(FlowTask::getInstanceId, instanceIds) , (lqw) -> lqw.in(FlowTask::getInstanceId, instanceIds)); } + + + @Override + public List getByInsIdAndNodeCodes(Long instanceId, List nodeCodes) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq(FlowTask::getInstanceId, instanceId); + queryWrapper.in(FlowTask::getNodeCode, nodeCodes); + return getMapper().selectListByQuery(queryWrapper); + } } diff --git a/warm-flow-mybatis-flex-core/src/main/java/org/dromara/warm/flow/orm/entity/FlowHisTask.java b/warm-flow-mybatis-flex-core/src/main/java/org/dromara/warm/flow/orm/entity/FlowHisTask.java index e38b49e..7f4c55b 100644 --- a/warm-flow-mybatis-flex-core/src/main/java/org/dromara/warm/flow/orm/entity/FlowHisTask.java +++ b/warm-flow-mybatis-flex-core/src/main/java/org/dromara/warm/flow/orm/entity/FlowHisTask.java @@ -141,7 +141,7 @@ public class FlowHisTask implements HisTask { private String skipType; /** - * 流程状态（1审批中 2 审批通过 9已退回 10失效） + * 流程状态（0待提交 1审批中 2审批通过 4终止 5作废 6撤销 8已完成 9已退回 10失效 11拿回） */ private String flowStatus; diff --git a/warm-flow-mybatis-flex-core/src/main/java/org/dromara/warm/flow/orm/entity/FlowInstance.java b/warm-flow-mybatis-flex-core/src/main/java/org/dromara/warm/flow/orm/entity/FlowInstance.java index 7c5a8e3..8df29b6 100644 --- a/warm-flow-mybatis-flex-core/src/main/java/org/dromara/warm/flow/orm/entity/FlowInstance.java +++ b/warm-flow-mybatis-flex-core/src/main/java/org/dromara/warm/flow/orm/entity/FlowInstance.java @@ -98,7 +98,7 @@ public class FlowInstance implements Instance { private String variable; /** - * 流程状态（0待提交 1审批中 2 审批通过 3自动通过 4终止 5作废 6撤销 7取回 8已完成 9已退回 10失效） + * 流程状态（0待提交 1审批中 2审批通过 4终止 5作废 6撤销 8已完成 9已退回 10失效 11拿回） */ private String flowStatus; diff --git a/warm-flow-mybatis-flex-core/src/main/java/org/dromara/warm/flow/orm/entity/FlowTask.java b/warm-flow-mybatis-flex-core/src/main/java/org/dromara/warm/flow/orm/entity/FlowTask.java index 998b17f..965cbe1 100644 --- a/warm-flow-mybatis-flex-core/src/main/java/org/dromara/warm/flow/orm/entity/FlowTask.java +++ b/warm-flow-mybatis-flex-core/src/main/java/org/dromara/warm/flow/orm/entity/FlowTask.java @@ -100,6 +100,11 @@ public class FlowTask implements Task { */ private Integer nodeType; + /** + * 流程状态（0待提交 1审批中 2审批通过 4终止 5作废 6撤销 8已完成 9已退回 10失效 11拿回） + */ + private String flowStatus; + /** * 权限标识 permissionFlag的list形式 */ diff --git a/warm-flow-mybatis-flex-sb-starter/pom.xml b/warm-flow-mybatis-flex-sb-starter/pom.xml index 2c07a37..e662cda 100644 --- a/warm-flow-mybatis-flex-sb-starter/pom.xml +++ b/warm-flow-mybatis-flex-sb-starter/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm-flow-mybatis-flex warm-flow-mybatis-flex - 1.6.9 + 1.7.0 warm-flow-mybatis-flex-sb-starter diff --git a/warm-flow-mybatis-flex-sb3-starter/pom.xml b/warm-flow-mybatis-flex-sb3-starter/pom.xml index d3ce7f1..91f28fc 100644 --- a/warm-flow-mybatis-flex-sb3-starter/pom.xml +++ b/warm-flow-mybatis-flex-sb3-starter/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm-flow-mybatis-flex warm-flow-mybatis-flex - 1.6.9 + 1.7.0 warm-flow-mybatis-flex-sb3-starter diff --git a/warm-flow-mybatis-flex-solon-plugin/pom.xml b/warm-flow-mybatis-flex-solon-plugin/pom.xml index 587bdf1..8cd70fa 100644 --- a/warm-flow-mybatis-flex-solon-plugin/pom.xml +++ b/warm-flow-mybatis-flex-solon-plugin/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm-flow-mybatis-flex warm-flow-mybatis-flex - 1.6.9 + 1.7.0 warm-flow-mybatis-flex-solon-plugin -- Gitee