Skip to content

Commit bbd21d8

Browse files
xlornexlorne
committed
fix waiting
1 parent 3afa458 commit bbd21d8

File tree

15 files changed

+29
-20
lines changed

15 files changed

+29
-20
lines changed

‎example/example-application/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>springboot-example</artifactId>
77
<groupId>com.codingapi.springboot</groupId>
8-
<version>3.3.66</version>
8+
<version>3.3.67</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎example/example-domain/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>springboot-example</artifactId>
77
<groupId>com.codingapi.springboot</groupId>
8-
<version>3.3.66</version>
8+
<version>3.3.67</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>springboot-example</artifactId>
77
<groupId>com.codingapi.springboot</groupId>
8-
<version>3.3.66</version>
8+
<version>3.3.67</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎example/example-infra-jpa/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>springboot-example</artifactId>
77
<groupId>com.codingapi.springboot</groupId>
8-
<version>3.3.66</version>
8+
<version>3.3.67</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎example/example-server/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>springboot-example</artifactId>
77
<groupId>com.codingapi.springboot</groupId>
8-
<version>3.3.66</version>
8+
<version>3.3.67</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎example/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</parent>
1818

1919
<artifactId>springboot-example</artifactId>
20-
<version>3.3.66</version>
20+
<version>3.3.67</version>
2121

2222
<name>springboot-example</name>
2323
<description>springboot-example project for Spring Boot</description>

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<groupId>com.codingapi.springboot</groupId>
1717
<artifactId>springboot-parent</artifactId>
18-
<version>3.3.66</version>
18+
<version>3.3.67</version>
1919

2020
<url>https://github.com/codingapi/springboot-framewrok</url>
2121
<name>springboot-parent</name>

‎springboot-starter-data-authorization/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.codingapi.springboot</groupId>
88
<artifactId>springboot-parent</artifactId>
9-
<version>3.3.66</version>
9+
<version>3.3.67</version>
1010
</parent>
1111

1212
<artifactId>springboot-starter-data-authorization</artifactId>

‎springboot-starter-data-fast/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>springboot-parent</artifactId>
77
<groupId>com.codingapi.springboot</groupId>
8-
<version>3.3.66</version>
8+
<version>3.3.67</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎springboot-starter-flow/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>springboot-parent</artifactId>
88
<groupId>com.codingapi.springboot</groupId>
9-
<version>3.3.66</version>
9+
<version>3.3.67</version>
1010
</parent>
1111

1212
<name>springboot-starter-flow</name>

‎springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowDirectionService.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ public void loadFlowSourceDirection() {
5555
*/
5656
public FlowSourceDirection reloadFlowSourceDirection() {
5757
if (flowNode.isSign()) {
58-
boolean allPass = historyRecords.stream().filter(item -> !item.isTransfer()).allMatch(FlowRecord::isPass);
58+
boolean allPass = historyRecords.stream().filter(item -> !item.isTransfer())
59+
.allMatch(item-> item.isPass() || item.getOpinion().isWaiting());
5960
if (!allPass) {
6061
flowSourceDirection = FlowSourceDirection.REJECT;
6162
}

‎springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/FlowTest2.java

+14-6
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,13 @@ void flowWaitingTest() {
127127
.title("请假流程")
128128
.nodes()
129129
.node("开始节点", "start", "default", ApprovalType.UN_SIGN, OperatorMatcher.anyOperatorMatcher())
130-
.node("老板审批", "boss", "default", ApprovalType.UN_SIGN, OperatorMatcher.specifyOperatorMatcher(boss.getUserId()))
130+
.node("老板审批", "boss", "default", ApprovalType.SIGN, OperatorMatcher.specifyOperatorMatcher(boss.getUserId()))
131+
.node("老板审批", "boss1", "default", ApprovalType.SIGN, OperatorMatcher.specifyOperatorMatcher(boss.getUserId()))
131132
.node("结束节点", "over", "default", ApprovalType.UN_SIGN, OperatorMatcher.anyOperatorMatcher())
132133
.relations()
133134
.relation("老板审批", "start", "boss")
134-
.relation("结束节点", "boss", "over")
135+
.relation("老板审批1", "boss", "boss1")
136+
.relation("结束节点", "boss1", "over")
135137
.build();
136138

137139
flowWorkRepository.save(flowWork);
@@ -151,11 +153,17 @@ void flowWaitingTest() {
151153
String processId = userTodos.get(0).getProcessId();
152154

153155
FlowRecord userTodo = userTodos.get(0);
154-
flowService.submitFlow(userTodo.getId(), lorne, leave, Opinion.waiting("自己先提交"));
156+
flowService.submitFlow(userTodo.getId(), lorne, leave, Opinion.pass("我提交了"));
155157

156158
// 查看boss的待办
157159
List<FlowRecord> bossTodos = flowRecordRepository.findTodoByOperatorId(boss.getUserId(), pageRequest).getContent();
158-
assertEquals(0, bossTodos.size());
160+
assertEquals(1, bossTodos.size());
161+
162+
FlowRecord bossTodo = bossTodos.get(0);
163+
flowService.submitFlow(bossTodo.getId(), boss, leave, Opinion.waiting("我等待提交"));
164+
165+
userTodos = flowRecordRepository.findTodoByOperatorId(lorne.getUserId(), pageRequest).getContent();
166+
assertEquals(0, userTodos.size());
159167

160168
// 通知流程
161169
flowService.notifyFlow(processId,boss);
@@ -164,14 +172,14 @@ void flowWaitingTest() {
164172
bossTodos = flowRecordRepository.findTodoByOperatorId(boss.getUserId(), pageRequest).getContent();
165173
assertEquals(1, bossTodos.size());
166174

167-
FlowRecord bossTodo = bossTodos.get(0);
175+
bossTodo = bossTodos.get(0);
168176
flowService.submitFlow(bossTodo.getId(), boss, leave, Opinion.pass("领导审批通过"));
169177

170178
bossTodos = flowRecordRepository.findTodoByOperatorId(lorne.getUserId(), pageRequest).getContent();
171179
assertEquals(0, bossTodos.size());
172180

173181
List<FlowRecord> records = flowRecordRepository.findAll(pageRequest).getContent();
174-
assertEquals(2, records.size());
182+
assertEquals(3, records.size());
175183

176184
// 查看所有流程是否都已经结束
177185
assertTrue(records.stream().allMatch(FlowRecord::isFinish));

‎springboot-starter-security/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>springboot-parent</artifactId>
88
<groupId>com.codingapi.springboot</groupId>
9-
<version>3.3.66</version>
9+
<version>3.3.67</version>
1010
</parent>
1111

1212
<artifactId>springboot-starter-security</artifactId>

‎springboot-starter/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.codingapi.springboot</groupId>
77
<artifactId>springboot-parent</artifactId>
8-
<version>3.3.66</version>
8+
<version>3.3.67</version>
99
</parent>
1010
<artifactId>springboot-starter</artifactId>
1111

‎springboot-starter/src/main/resources/banner.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
------------------------------------------------------
2-
CodingApi SpringBoot-Starter 3.3.66
2+
CodingApi SpringBoot-Starter 3.3.67
33
springboot version (${spring-boot.version})
44
------------------------------------------------------

0 commit comments

Comments
 (0)