Merge pull request #84 from codingapi/flow-dev

Flow dev

Author: xlorne

admin-ui/src/pages/flow/work/index.tsx

@@ -5,7 +5,7 @@ import {
     ModalForm,
     PageContainer,
     ProForm,
-    ProFormDigit,
+    ProFormDigit, ProFormSwitch,
     ProFormText, ProFormTextArea,
     ProTable
 } from "@ant-design/pro-components";
@@ -254,6 +254,12 @@ const FlowPage = () => {
                     ]}
                 />
 
+                <ProFormSwitch
+                    name={"skipIfSameApprover"}
+                    tooltip={"是否跳过相同审批人，默认为否"}
+                    label={"是否跳过相同审批人"}
+                />
+
             </ModalForm>
 
 

example/example-application/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.47</version>
+        <version>3.3.48</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

example/example-application/src/main/java/com/codingapi/example/pojo/cmd/FlowWorkCmd.java

@@ -16,6 +16,7 @@ public static class CreateRequest{
         private String code;
         private String description;
         private int postponedMax;
+        private boolean skipIfSameApprover;
 
 
         public String getUsername(){

example/example-application/src/main/java/com/codingapi/example/router/FlowWorkRouter.java

@@ -29,14 +29,21 @@ public void save(FlowWorkCmd.CreateRequest request) {
         User user = userRepository.getUserByUsername(request.getUsername());
         long id = request.getId();
         if (id == 0) {
-            FlowWork flowWork = new FlowWork(request.getCode(),request.getTitle(), request.getDescription(), request.getPostponedMax(), user);
+            FlowWork flowWork = new FlowWork(
+                    request.getCode(),
+                    request.getTitle(),
+                    request.getDescription(),
+                    request.isSkipIfSameApprover(),
+                    request.getPostponedMax(),
+                    user);
             flowWorkRepository.save(flowWork);
         } else {
             FlowWorkEntity flowWork = flowWorkEntityRepository.getFlowWorkEntityById(id);
             flowWork.setTitle(request.getTitle());
             flowWork.setCode(request.getCode());
             flowWork.setDescription(request.getDescription());
             flowWork.setPostponedMax(request.getPostponedMax());
+            flowWork.setSkipIfSameApprover(request.isSkipIfSameApprover());
             flowWork.setUpdateTime(System.currentTimeMillis());
             flowWorkEntityRepository.save(flowWork);
         }

example/example-domain/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.47</version>
+        <version>3.3.48</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

example/example-infra-flow/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.47</version>
+        <version>3.3.48</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -19,6 +19,7 @@ public static FlowWorkEntity convert(FlowWork flowWork) {
         entity.setCreateTime(flowWork.getCreateTime());
         entity.setUpdateTime(flowWork.getUpdateTime());
         entity.setEnable(flowWork.isEnable());
+        entity.setSkipIfSameApprover(flowWork.isSkipIfSameApprover());
         entity.setPostponedMax(flowWork.getPostponedMax());
         entity.setSchema(flowWork.getSchema());
         return entity;

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

@@ -28,6 +28,12 @@ public class FlowWorkEntity {
 
     private Boolean enable;
 
+    /**
+     * 是否跳过相同审批人，默认为false
+     */
+    private Boolean skipIfSameApprover;
+
+
     private Integer postponedMax;
 
     @Lob

example/example-infra-flow/src/main/java/com/codingapi/example/repository/FlowProcessRepositoryImpl.java

@@ -31,6 +31,9 @@ public FlowWork getFlowWorkByProcessId(String processId) {
             return null;
         }
         FlowBackup flowBackup = flowBackupRepository.getFlowBackupById(flowProcess.getBackupId());
-        return flowBackup.resume(flowOperatorRepository);
+        if(flowBackup!=null) {
+            return flowBackup.resume(flowOperatorRepository);
+        }
+        return null;
     }
 }

example/example-infra-flow/src/main/java/com/codingapi/example/repository/FlowWorkRepositoryImpl.java

@@ -49,6 +49,7 @@ public FlowWork getFlowWorkById(long id) {
                 entity.getCreateTime(),
                 entity.getUpdateTime(),
                 entity.getEnable(),
+                entity.getSkipIfSameApprover(),
                 entity.getPostponedMax(),
                 flowNodes,
                 flowRelations,
@@ -81,6 +82,7 @@ public FlowWork getFlowWorkByCode(String code) {
                 entity.getCreateTime(),
                 entity.getUpdateTime(),
                 entity.getEnable(),
+                entity.getSkipIfSameApprover(),
                 entity.getPostponedMax(),
                 flowNodes,
                 flowRelations,