Skip to content

Commit 86bedc5

Browse files
committed
add merge flow
1 parent c161a37 commit 86bedc5

File tree

40 files changed

+153
-44
lines changed

40 files changed

+153
-44
lines changed

example/example-app/example-app-cmd-domain/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.codingapi.springboot</groupId>
88
<artifactId>example-app</artifactId>
9-
<version>3.3.70</version>
9+
<version>3.4.0</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

example/example-app/example-app-cmd-meta/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.codingapi.springboot</groupId>
88
<artifactId>example-app</artifactId>
9-
<version>3.3.70</version>
9+
<version>3.4.0</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

example/example-app/example-app-query/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.codingapi.springboot</groupId>
88
<artifactId>example-app</artifactId>
9-
<version>3.3.70</version>
9+
<version>3.4.0</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

example/example-app/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.codingapi.springboot</groupId>
88
<artifactId>springboot-example</artifactId>
9-
<version>3.3.70</version>
9+
<version>3.4.0</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212
<packaging>pom</packaging>

example/example-domain/example-domain-leave/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.codingapi.springboot</groupId>
88
<artifactId>example-domain</artifactId>
9-
<version>3.3.70</version>
9+
<version>3.4.0</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

example/example-domain/example-domain-user/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.codingapi.springboot</groupId>
88
<artifactId>example-domain</artifactId>
9-
<version>3.3.70</version>
9+
<version>3.4.0</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

example/example-domain/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.codingapi.springboot</groupId>
77
<artifactId>springboot-example</artifactId>
8-
<version>3.3.70</version>
8+
<version>3.4.0</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111
<modelVersion>4.0.0</modelVersion>

example/example-infra/example-infra-flow/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.codingapi.springboot</groupId>
77
<artifactId>example-infra</artifactId>
8-
<version>3.3.70</version>
8+
<version>3.4.0</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

example/example-infra/example-infra-flow/src/main/java/com/codingapi/example/infra/flow/convert/FlowNodeConvertor.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ public static FlowNodeEntity convert(FlowNode flowNode, long workId){
2121
entity.setCode(flowNode.getCode());
2222
entity.setName(flowNode.getName());
2323
entity.setEditable(flowNode.isEditable());
24+
entity.setMergeable(flowNode.isMergeable());
2425
entity.setCreateTime(flowNode.getCreateTime());
2526
entity.setType(flowNode.getType().name());
2627
entity.setTimeout(flowNode.getTimeout());
@@ -52,6 +53,7 @@ public static FlowNode convert(FlowNodeEntity entity){
5253
ApprovalType.parser(entity.getApprovalType()),
5354
new OperatorMatcher(entity.getOperatorMatcher()),
5455
entity.getEditable(),
56+
entity.getMergeable(),
5557
entity.getCreateTime(),
5658
entity.getUpdateTime(),
5759
entity.getTimeout(),

example/example-infra/example-infra-flow/src/main/java/com/codingapi/example/infra/flow/convert/FlowRecordConvertor.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ public static FlowRecordEntity convert(FlowRecord flowRecord) {
2121
entity.setWorkId(flowRecord.getWorkId());
2222
entity.setProcessId(flowRecord.getProcessId());
2323
entity.setNodeCode(flowRecord.getNodeCode());
24+
entity.setMergeable(flowRecord.isMergeable());
2425
entity.setTitle(flowRecord.getTitle());
2526
entity.setCurrentOperatorId(flowRecord.getCurrentOperator().getUserId());
2627
entity.setFlowType(flowRecord.getFlowType().name());
@@ -71,6 +72,7 @@ public static FlowRecord convert(FlowRecordEntity entity, FlowOperatorRepository
7172
flowRecord.setWorkId(entity.getWorkId());
7273
flowRecord.setProcessId(entity.getProcessId());
7374
flowRecord.setNodeCode(entity.getNodeCode());
75+
flowRecord.setMergeable(entity.getMergeable());
7476
flowRecord.setTitle(entity.getTitle());
7577
flowRecord.setCurrentOperator(flowUserRepository.getFlowOperatorById(entity.getCurrentOperatorId()));
7678
flowRecord.setFlowType(FlowType.parser(entity.getFlowType()));

0 commit comments

Comments
 (0)