Skip to content

Commit d982b17

Browse files
xlornexlorne
committed
add FlowRecord workCode
1 parent 84b5b20 commit d982b17

File tree

20 files changed

+181
-17
lines changed

20 files changed

+181
-17
lines changed

‎example/example-application/pom.xml‎

Lines changed: 1 addition & 1 deletion
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.11</version>
8+
<version>3.3.12</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎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
<artifactId>springboot-example</artifactId>
77
<groupId>com.codingapi.springboot</groupId>
8-
<version>3.3.11</version>
8+
<version>3.3.12</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎example/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
<artifactId>springboot-example</artifactId>
77
<groupId>com.codingapi.springboot</groupId>
8-
<version>3.3.11</version>
8+
<version>3.3.12</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public static FlowRecordEntity convert(FlowRecord flowRecord) {
4242

4343
entity.setCurrentOperatorName(flowRecord.getCurrentOperator().getName());
4444
entity.setCreateOperatorName(flowRecord.getCreateOperator().getName());
45+
entity.setWorkCode(flowRecord.getWorkCode());
4546

4647
entity.setFlowStatus(flowRecord.getFlowStatus().name());
4748
entity.setErrMessage(flowRecord.getErrMessage());
@@ -92,6 +93,7 @@ public static FlowRecord convert(FlowRecordEntity entity, UserRepository userRep
9293
if(entity.getInterferedOperatorId()!=null) {
9394
flowRecord.setInterferedOperator(userRepository.getUserById(entity.getInterferedOperatorId()));
9495
}
96+
flowRecord.setWorkCode(entity.getWorkCode());
9597
flowRecord.setReadTime(entity.getReadTime());
9698
return flowRecord;
9799
}

‎example/example-infra-flow/src/main/java/com/codingapi/example/entity/FlowRecordEntity.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@ public class FlowRecordEntity {
2525
* 工作id
2626
*/
2727
private Long workId;
28+
29+
/**
30+
* 流程编码
31+
*/
32+
private String workCode;
33+
2834
/**
2935
* 流程id
3036
*/

‎example/example-infra-flow/src/main/java/com/codingapi/example/jpa/FlowRecordEntityRepository.java‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import java.util.List;
1010

11-
public interface FlowRecordEntityRepository extends FastRepository<FlowRecordEntity,Long> {
11+
public interface FlowRecordEntityRepository extends FastRepository<FlowRecordEntity, Long> {
1212

1313

1414
FlowRecordEntity getFlowRecordEntityById(long id);
@@ -22,19 +22,33 @@ public interface FlowRecordEntityRepository extends FastRepository<FlowRecordEnt
2222
List<FlowRecordEntity> findTodoFlowRecordByProcessId(String processId);
2323

2424
@Query(value = "select r from FlowRecordEntity r where r.currentOperatorId = ?1 and r.flowType = 'TODO' and r.flowStatus = 'RUNNING' order by r.id desc")
25-
Page<FlowRecordEntity> findTodoByOperatorId(long operatorId,PageRequest pageRequest);
25+
Page<FlowRecordEntity> findTodoByOperatorId(long operatorId, PageRequest pageRequest);
26+
27+
@Query(value = "select r from FlowRecordEntity r where r.currentOperatorId = ?1 and r.workCode = ?2 and r.flowType = 'TODO' and r.flowStatus = 'RUNNING' order by r.id desc")
28+
Page<FlowRecordEntity> findTodoByOperatorIdAndWorkCode(long operatorId, String workCode, PageRequest pageRequest);
2629

2730
@Query(value = "select r from FlowRecordEntity r where r.currentOperatorId = ?1 and r.flowType = 'DONE' order by r.id desc")
2831
Page<FlowRecordEntity> findDoneByOperatorId(long operatorId, PageRequest pageRequest);
2932

33+
@Query(value = "select r from FlowRecordEntity r where r.currentOperatorId = ?1 and r.workCode = ?2 and r.flowType = 'DONE' order by r.id desc")
34+
Page<FlowRecordEntity> findDoneByOperatorIdAndworkCode(long operatorId, String workCode, PageRequest pageRequest);
35+
3036
@Query(value = "select r from FlowRecordEntity r where r.currentOperatorId = ?1 and r.preId = 0 and r.nodeCode = 'start' order by r.id desc")
3137
Page<FlowRecordEntity> findInitiatedByOperatorId(long operatorId, PageRequest pageRequest);
3238

39+
@Query(value = "select r from FlowRecordEntity r where r.currentOperatorId = ?1 and r.workCode = ?2 and r.preId = 0 and r.nodeCode = 'start' order by r.id desc")
40+
Page<FlowRecordEntity> findInitiatedByOperatorIdAndWorkCode(long operatorId, String workCode, PageRequest pageRequest);
41+
3342
@Query(value = "select r from FlowRecordEntity r where r.currentOperatorId = ?1 and r.flowType = 'TODO' and r.flowStatus = 'RUNNING' and r.timeoutTime >0 and r.timeoutTime < ?2 order by r.id desc")
34-
Page<FlowRecordEntity> findTimeoutTodoByOperatorId(long operatorId,long currentTime, PageRequest pageRequest);
43+
Page<FlowRecordEntity> findTimeoutTodoByOperatorId(long operatorId, long currentTime, PageRequest pageRequest);
44+
45+
@Query(value = "select r from FlowRecordEntity r where r.currentOperatorId = ?1 and r.workCode = ?2 and r.flowType = 'TODO' and r.flowStatus = 'RUNNING' and r.timeoutTime >0 and r.timeoutTime < ?3 order by r.id desc")
46+
Page<FlowRecordEntity> findTimeoutTodoByOperatorIdAndWorkCode(long operatorId, String workCode, long currentTime, PageRequest pageRequest);
3547

3648
@Query(value = "select r from FlowRecordEntity r where r.currentOperatorId = ?1 and r.flowType = 'TODO' and r.flowStatus = 'RUNNING' and r.postponedCount > 0 order by r.id desc")
3749
Page<FlowRecordEntity> findPostponedTodoByOperatorId(long operatorId, PageRequest pageRequest);
3850

51+
@Query(value = "select r from FlowRecordEntity r where r.currentOperatorId = ?1 and r.workCode =?2 and r.flowType = 'TODO' and r.flowStatus = 'RUNNING' and r.postponedCount > 0 order by r.id desc")
52+
Page<FlowRecordEntity> findPostponedTodoByOperatorIdAndWorkCode(long operatorId, String workCode, PageRequest pageRequest);
3953

4054
}

‎example/example-infra-flow/src/main/java/com/codingapi/example/query/FlowRecordQueryImpl.java‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,27 +31,62 @@ public Page<FlowRecord> findTodoByOperatorId(long operatorId, PageRequest pageRe
3131
return page.map(item->FlowRecordConvertor.convert(item,userRepository));
3232
}
3333

34+
35+
@Override
36+
public Page<FlowRecord> findTodoByOperatorId(long operatorId, String workCode, PageRequest pageRequest) {
37+
Page<FlowRecordEntity> page = flowRecordEntityRepository.findTodoByOperatorIdAndWorkCode(operatorId,workCode,pageRequest);
38+
return page.map(item->FlowRecordConvertor.convert(item,userRepository));
39+
}
40+
41+
3442
@Override
3543
public Page<FlowRecord> findDoneByOperatorId(long operatorId, PageRequest pageRequest) {
3644
Page<FlowRecordEntity> page = flowRecordEntityRepository.findDoneByOperatorId(operatorId,pageRequest);
3745
return page.map(item->FlowRecordConvertor.convert(item,userRepository));
3846
}
3947

48+
49+
@Override
50+
public Page<FlowRecord> findDoneByOperatorId(long operatorId, String workCode, PageRequest pageRequest) {
51+
Page<FlowRecordEntity> page = flowRecordEntityRepository.findDoneByOperatorIdAndworkCode(operatorId,workCode,pageRequest);
52+
return page.map(item->FlowRecordConvertor.convert(item,userRepository));
53+
}
54+
4055
@Override
4156
public Page<FlowRecord> findInitiatedByOperatorId(long operatorId, PageRequest pageRequest) {
4257
Page<FlowRecordEntity> page = flowRecordEntityRepository.findInitiatedByOperatorId(operatorId,pageRequest);
4358
return page.map(item->FlowRecordConvertor.convert(item,userRepository));
4459
}
4560

61+
@Override
62+
public Page<FlowRecord> findInitiatedByOperatorId(long operatorId, String workCode, PageRequest pageRequest) {
63+
Page<FlowRecordEntity> page = flowRecordEntityRepository.findInitiatedByOperatorIdAndWorkCode(operatorId,workCode,pageRequest);
64+
return page.map(item->FlowRecordConvertor.convert(item,userRepository));
65+
}
66+
4667
@Override
4768
public Page<FlowRecord> findTimeoutTodoByOperatorId(long operatorId, PageRequest pageRequest) {
4869
Page<FlowRecordEntity> page = flowRecordEntityRepository.findTimeoutTodoByOperatorId(operatorId,System.currentTimeMillis(), pageRequest);
4970
return page.map(item->FlowRecordConvertor.convert(item,userRepository));
5071
}
5172

73+
74+
@Override
75+
public Page<FlowRecord> findTimeoutTodoByOperatorId(long operatorId, String workCode, PageRequest pageRequest) {
76+
Page<FlowRecordEntity> page = flowRecordEntityRepository.findTimeoutTodoByOperatorIdAndWorkCode(operatorId,workCode,System.currentTimeMillis(), pageRequest);
77+
return page.map(item->FlowRecordConvertor.convert(item,userRepository));
78+
}
79+
5280
@Override
5381
public Page<FlowRecord> findPostponedTodoByOperatorId(long operatorId, PageRequest pageRequest) {
5482
Page<FlowRecordEntity> page = flowRecordEntityRepository.findPostponedTodoByOperatorId(operatorId,pageRequest);
5583
return page.map(item->FlowRecordConvertor.convert(item,userRepository));
5684
}
85+
86+
87+
@Override
88+
public Page<FlowRecord> findPostponedTodoByOperatorId(long operatorId, String workCode, PageRequest pageRequest) {
89+
Page<FlowRecordEntity> page = flowRecordEntityRepository.findPostponedTodoByOperatorIdAndWorkCode(operatorId,workCode,pageRequest);
90+
return page.map(item->FlowRecordConvertor.convert(item,userRepository));
91+
}
5792
}

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

Lines changed: 1 addition & 1 deletion
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.11</version>
8+
<version>3.3.12</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎example/example-server/pom.xml‎

Lines changed: 1 addition & 1 deletion
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.11</version>
8+
<version>3.3.12</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎example/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</parent>
1818

1919
<artifactId>springboot-example</artifactId>
20-
<version>3.3.11</version>
20+
<version>3.3.12</version>
2121

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

0 commit comments

Comments
 (0)