diff --git a/pom.xml b/pom.xml index dda5e4e88d6f74ca010a073a4587e1ae55677c5c..95cc769efc6af2a8b8f24671f7f44d12944d1566 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.7.4 + 1.8.0 pom warm-flow-mybatis-flex @@ -39,12 +39,12 @@ warm-flow-mybatis-flex-sb-starter warm-flow-mybatis-flex-sb3-starter warm-flow-mybatis-flex-solon-plugin - + warm-flow-mybatis-flex-test - 1.7.4 - 1.7.4 + 1.8.0 + 1.8.0 8 @@ -147,11 +147,11 @@ ${warm-flow} - + org.dromara.warm-flow-mybatis-flex diff --git a/warm-flow-mybatis-flex-core/pom.xml b/warm-flow-mybatis-flex-core/pom.xml index b9d8e21494b804c93b71e33629407bbc95dced31..ee9efb7e6c85e2c7e79ef5f2048fcc8d07f60d7b 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.7.4 + 1.8.0 warm-flow-mybatis-flex-core diff --git a/warm-flow-mybatis-flex-core/src/main/java/org/dromara/warm/flow/orm/entity/FlowDefinition.java b/warm-flow-mybatis-flex-core/src/main/java/org/dromara/warm/flow/orm/entity/FlowDefinition.java index 0515839330464b2ca412009bd5fbec609b2bc69c..a59ee34d241cd2d5e163e6074b7da12c480109c7 100644 --- a/warm-flow-mybatis-flex-core/src/main/java/org/dromara/warm/flow/orm/entity/FlowDefinition.java +++ b/warm-flow-mybatis-flex-core/src/main/java/org/dromara/warm/flow/orm/entity/FlowDefinition.java @@ -75,6 +75,11 @@ public class FlowDefinition implements Definition { */ private String flowName; + /** + * 设计器模型(CLASSICS经典模型 MIMIC仿钉钉模型) + */ + private String modelValue; + /** * 流程类别 */ diff --git a/warm-flow-mybatis-flex-core/src/main/java/org/dromara/warm/flow/orm/entity/FlowForm.java b/warm-flow-mybatis-flex-core/src/main/java/org/dromara/warm/flow/orm/entity/FlowForm.java index e2066d03671b1667642560bb7ee7ebb43b9d3748..37827aa260e68f537f4e6389c67de0f635497e45 100644 --- a/warm-flow-mybatis-flex-core/src/main/java/org/dromara/warm/flow/orm/entity/FlowForm.java +++ b/warm-flow-mybatis-flex-core/src/main/java/org/dromara/warm/flow/orm/entity/FlowForm.java @@ -2,8 +2,9 @@ package org.dromara.warm.flow.orm.entity; import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Table; +import lombok.Data; +import lombok.experimental.Accessors; import org.dromara.warm.flow.core.entity.Form; -import org.dromara.warm.flow.core.entity.HisTask; import java.util.Date; @@ -13,6 +14,8 @@ import java.util.Date; * @description * @since 2024-9-23 16:13 */ +@Data +@Accessors(chain = true) @Table("flow_form") public class FlowForm implements Form { @@ -81,165 +84,4 @@ public class FlowForm implements Form { */ private String delFlag; - @Override - public Long getId() { - return id; - } - - @Override - public FlowForm setId(Long id) { - this.id = id; - return this; - } - - @Override - public Date getCreateTime() { - return createTime; - } - - @Override - public FlowForm setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - - @Override - public Date getUpdateTime() { - return updateTime; - } - - @Override - public FlowForm setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - return this; - } - - @Override - public String getTenantId() { - return tenantId; - } - - @Override - public FlowForm setTenantId(String tenantId) { - this.tenantId = tenantId; - return this; - } - - @Override - public String getDelFlag() { - return delFlag; - } - - @Override - public FlowForm setDelFlag(String delFlag) { - this.delFlag = delFlag; - return this; - } - - @Override - public String getFormCode() { - return formCode; - } - - @Override - public FlowForm setFormCode(String formCode) { - this.formCode = formCode; - return this; - } - - @Override - public String getFormName() { - return formName; - } - - @Override - public FlowForm setFormName(String formName) { - this.formName = formName; - return this; - } - - @Override - public String getVersion() { - return version; - } - - @Override - public FlowForm setVersion(String version) { - this.version = version; - return this; - } - - @Override - public Integer getIsPublish() { - return isPublish; - } - - @Override - public FlowForm setIsPublish(Integer isPublish) { - this.isPublish = isPublish; - return this; - } - - @Override - public Integer getFormType() { - return formType; - } - - @Override - public FlowForm setFormType(Integer formType) { - this.formType = formType; - return this; - } - - @Override - public String getFormPath() { - return formPath; - } - - @Override - public FlowForm setFormPath(String formPath) { - this.formPath = formPath; - return this; - } - - @Override - public String getFormContent() { - return formContent; - } - - @Override - public FlowForm setFormContent(String formContent) { - this.formContent = formContent; - return this; - } - - @Override - public String getExt() { - return ext; - } - - @Override - public FlowForm setExt(String ext) { - this.ext = ext; - return this; - } - - @Override - public String toString() { - return "FlowForm{" + - "id=" + id + - ", createTime=" + createTime + - ", updateTime=" + updateTime + - ", tenantId='" + tenantId + '\'' + - ", delFlag='" + delFlag + '\'' + - ", formCode='" + formCode + '\'' + - ", formName='" + formName + '\'' + - ", version='" + version + '\'' + - ", isPublish=" + isPublish + - ", formType=" + formType + - ", formPath='" + formPath + '\'' + - ", formContent='" + formContent + '\'' + - ", ext='" + ext + '\'' + - '}'; - } } diff --git a/warm-flow-mybatis-flex-sb-starter/pom.xml b/warm-flow-mybatis-flex-sb-starter/pom.xml index 81fc4c26dfe41348a8b01fc4c769c36c7c67d6fb..dab9a5ce031e95282944ac168897d0cbbe322e63 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.7.4 + 1.8.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 63bf3b929aee3367dcbb7a2da8842146ce903bbe..37d878080890c2a79d1cabf1824e9fa75d5511da 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.7.4 + 1.8.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 e8bf68a817b4772a74197c467003c07ec9602ea9..a4afa5619464731064f0d7cfab62257add98ad9b 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.7.4 + 1.8.0 warm-flow-mybatis-flex-solon-plugin diff --git a/warm-flow-mybatis-flex-test/pom.xml b/warm-flow-mybatis-flex-test/pom.xml index 00923358867c4fe3056d2292df930378affc98bb..359918749160d85a01079675fa960551f52951fb 100644 --- a/warm-flow-mybatis-flex-test/pom.xml +++ b/warm-flow-mybatis-flex-test/pom.xml @@ -7,7 +7,7 @@ org.dromara.warm-flow-mybatis-flex warm-flow-mybatis-flex - 1.6.9 + 1.8.0 warm-flow-mybatis-flex-test diff --git a/warm-flow-mybatis-flex-test/warm-flow-mybatis-flex-core-test/pom.xml b/warm-flow-mybatis-flex-test/warm-flow-mybatis-flex-core-test/pom.xml index 0869d274e9bf9dae229b6eafbf7518236569b892..c031af9f2b0502ab8a86e9184d3ed21f981a3a4f 100644 --- a/warm-flow-mybatis-flex-test/warm-flow-mybatis-flex-core-test/pom.xml +++ b/warm-flow-mybatis-flex-test/warm-flow-mybatis-flex-core-test/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm-flow-mybatis-flex warm-flow-mybatis-flex-test - 1.6.9 + 1.8.0 warm-flow-mybatis-flex-core-test diff --git a/warm-flow-mybatis-flex-test/warm-flow-mybatis-flex-core-test/src/main/java/org/dromara/warm/flow/core/FlowBaseTest.java b/warm-flow-mybatis-flex-test/warm-flow-mybatis-flex-core-test/src/main/java/org/dromara/warm/flow/core/FlowBaseTest.java index e67bc1a92f68ff71afba858f692c9d2bd928b3fd..2aeb03098ed11e6b5287918644fc1578448dbc9d 100644 --- a/warm-flow-mybatis-flex-test/warm-flow-mybatis-flex-core-test/src/main/java/org/dromara/warm/flow/core/FlowBaseTest.java +++ b/warm-flow-mybatis-flex-test/warm-flow-mybatis-flex-core-test/src/main/java/org/dromara/warm/flow/core/FlowBaseTest.java @@ -41,11 +41,11 @@ public class FlowBaseTest { } public Long getInsId() { - return 241009209599676416L; + return 314188872597176320L; } public Long getTaskId() { - return 1266424585176354816L; + return 314188872605564928L; } public String getBusinessId() { @@ -156,7 +156,7 @@ public class FlowBaseTest { /** * 办理 */ - public void skipFlow(InsService insService, TaskService taskService) { + public void skipFlow(TaskService taskService) { // 通过实例id流转 FlowParams flowParams = getUser().skipType(SkipType.PASS.getKey()) .permissionFlag(Arrays.asList("role:1", "role:2")); @@ -164,7 +164,7 @@ public class FlowBaseTest { variable.put("testLeave", new HashMap<>()); variable.put("flag", "1"); flowParams.variable(variable); - Instance instance = insService.skipByInsId(getInsId(), flowParams); + Instance instance = taskService.skipByInsId(getInsId(), flowParams); System.out.println("流转后流程实例:" + instance.toString()); // // 通过任务id流转 diff --git a/warm-flow-mybatis-flex-test/warm-flow-mybatis-flex-sb-test/pom.xml b/warm-flow-mybatis-flex-test/warm-flow-mybatis-flex-sb-test/pom.xml index 2edc7763c501a7b003f6e84c46c9f4f1302b616a..270d187a2dc908c247966d245ccd273c5a47afc1 100644 --- a/warm-flow-mybatis-flex-test/warm-flow-mybatis-flex-sb-test/pom.xml +++ b/warm-flow-mybatis-flex-test/warm-flow-mybatis-flex-sb-test/pom.xml @@ -5,7 +5,7 @@ org.dromara.warm-flow-mybatis-flex warm-flow-mybatis-flex-test - 1.6.9 + 1.8.0 warm-flow-mybatis-flex-sb-test @@ -25,10 +25,10 @@ warm-flow-mybatis-flex-sb-starter - + diff --git a/warm-flow-mybatis-flex-test/warm-flow-mybatis-flex-sb-test/src/test/java/org/dromara/warm/flow/FlowTest.java b/warm-flow-mybatis-flex-test/warm-flow-mybatis-flex-sb-test/src/test/java/org/dromara/warm/flow/FlowTest.java index ad84c10d8a416a6f937e3322ab5e6d396d8ff641..0d722d2b0170297a307bc4c36fe595870b5cdbc3 100644 --- a/warm-flow-mybatis-flex-test/warm-flow-mybatis-flex-sb-test/src/test/java/org/dromara/warm/flow/FlowTest.java +++ b/warm-flow-mybatis-flex-test/warm-flow-mybatis-flex-sb-test/src/test/java/org/dromara/warm/flow/FlowTest.java @@ -133,7 +133,7 @@ public class FlowTest extends FlowBaseTest { */ @Test public void skipFlow() { - skipFlow(insService, taskService); + skipFlow(taskService); } /** diff --git a/warm-flow-mybatis-flex-test/warm-flow-mybatis-flex-solon-test/pom.xml b/warm-flow-mybatis-flex-test/warm-flow-mybatis-flex-solon-test/pom.xml index 000e2d8c61fdb93e618c47f6393f5db53c212a6d..819a479c0a786939550c474296066db0d306c8de 100644 --- a/warm-flow-mybatis-flex-test/warm-flow-mybatis-flex-solon-test/pom.xml +++ b/warm-flow-mybatis-flex-test/warm-flow-mybatis-flex-solon-test/pom.xml @@ -7,7 +7,7 @@ org.dromara.warm-flow-mybatis-flex warm-flow-mybatis-flex-test - 1.6.9 + 1.8.0 warm-flow-mybatis-flex-solon-test diff --git a/warm-flow-mybatis-flex-test/warm-flow-mybatis-flex-solon-test/src/test/java/org/dromara/warm/flow/FlowTest.java b/warm-flow-mybatis-flex-test/warm-flow-mybatis-flex-solon-test/src/test/java/org/dromara/warm/flow/FlowTest.java index 05cbd39e537eeaa6cb5738f18d555bb967f9d18f..1d53f51b73ebaf0bd6488924ddb8ca9ebe1c7c2f 100644 --- a/warm-flow-mybatis-flex-test/warm-flow-mybatis-flex-solon-test/src/test/java/org/dromara/warm/flow/FlowTest.java +++ b/warm-flow-mybatis-flex-test/warm-flow-mybatis-flex-solon-test/src/test/java/org/dromara/warm/flow/FlowTest.java @@ -132,7 +132,7 @@ public class FlowTest extends FlowBaseTest { @Test @Tran public void skipFlow() { - skipFlow(insService, taskService); + skipFlow(taskService); } /**