fuhouyin/flowlong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整依赖测试issue

Browse Source
This commit is contained in:
hubin 2024-07-14 15:17:04 +08:00
parent 1918d4665b
commit 7410cfba50
7 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -71,7 +71,7 @@ subprojects {
dependency("mysql:mysql-connector-java:8.0.33")
// orm db
dependency("com.baomidou:mybatis-plus-spring-boot3-starter:${mybatisPlusVersion}")
dependency("com.baomidou:mybatis-plus-boot-starter:${mybatisPlusVersion}")
dependency("com.baomidou:mybatis-plus-core:${mybatisPlusVersion}")
}

2
flowlong-spring-boot-example/build.gradle
View File

@ -4,7 +4,7 @@ dependencies {
implementation project(":flowlong-spring-boot-starter")
implementation("org.springframework.boot:spring-boot-starter-web")
implementation("org.springframework.boot:spring-boot-starter-jdbc")
implementation("com.baomidou:mybatis-plus-spring-boot3-starter")
implementation("com.baomidou:mybatis-plus-boot-starter")
implementation("mysql:mysql-connector-java")
}

2
flowlong-spring-boot-example/pom.xml
View File

@ -30,7 +30,7 @@
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
<artifactId>mybatis-plus-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>

2
flowlong-spring-boot-starter/build.gradle
View File

@ -3,7 +3,7 @@ description "flowLong mybatis-plus spring-boot starter"
dependencies {
api project(":flowlong-mybatis-plus")
implementation("com.baomidou:mybatis-plus-spring-boot3-starter")
implementation("com.baomidou:mybatis-plus-boot-starter")
compileOnly("org.springframework.boot:spring-boot-starter-web")
compileOnly("org.springframework.boot:spring-boot-autoconfigure")

2
flowlong-spring-boot-starter/pom.xml
View File

@ -21,7 +21,7 @@
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<scope>provided</scope>
</dependency>

15
flowlong-spring-boot-starter/src/test/java/test/mysql/TestIssue.java
View File

@ -244,16 +244,14 @@ public class TestIssue extends MysqlTest {
Long processId = processService.deployByResource("test/issues_I9SVKP.json", testCreator, false);
// 启动流程
final Map<String, Object> args = new HashMap<>();
args.put("day", 3);
flowLongEngine.startInstanceById(processId, testCreator, args).ifPresent(flwInstance -> {
flowLongEngine.startInstanceById(processId, testCreator).ifPresent(instance -> {
// 执行转办、任务交给 test2 处理
this.executeTask(flwInstance.getId(), testCreator, flwTask -> flowLongEngine.taskService()
this.executeTask(instance.getId(), testCreator, flwTask -> flowLongEngine.taskService()
.transferTask(flwTask.getId(), testCreator, test2Creator));
// 转办人（前置加签）
flowLongEngine.queryService().getActiveTasksByInstanceId(flwInstance.getId()).flatMap(flwTasks -> flwTasks.stream()
flowLongEngine.queryService().getActiveTasksByInstanceId(instance.getId()).flatMap(flwTasks -> flwTasks.stream()
.filter(t -> Objects.equals("领导审批", t.getTaskName())).findFirst()).ifPresent(flwTask -> {
NodeModel nodeModel = new NodeModel();
nodeModel.setNodeName("前置加签");
@ -264,6 +262,13 @@ public class TestIssue extends MysqlTest {
nodeModel.setNodeAssigneeList(Collections.singletonList(NodeAssignee.ofFlowCreator(test3Creator)));
flowLongEngine.executeAppendNodeModel(flwTask.getId(), nodeModel, test2Creator, true);
});
// test3 执行前加签
this.executeTask(instance.getId(), test3Creator);
// 领导审批
this.executeTask(instance.getId(), testCreator);
});
}

2
pom.xml
View File

@ -66,7 +66,7 @@
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>${mybatis.plus-version}</version>
</dependency>
<dependency>