FlowSession support flow operator

xlorne · xlorne · commit 6af1b9412016 · 2024-11-27T22:43:37.000+08:00
diff --git a/admin-ui/src/components/Flow/flow/data.ts b/admin-ui/src/components/Flow/flow/data.ts
@@ -28,7 +28,36 @@ export class FlowWorkData {
 }
 
 
-export class FlowSubmitResultBuilder {
+export class FlowSubmitResultBuilder extends FlowWorkData {
+
+    constructor(data: any) {
+        super(data);
+    }
+
+    builder() {
+        const records = this.data.records;
+        const resultItems = [];
+        for (const record of records) {
+            const node = this.getNode(record.nodeCode);
+            resultItems.push({
+                label: '下级审批节点',
+                value: node.name
+            });
+
+            resultItems.push({
+                label: '下级审批人',
+                value: record.currentOperator.name
+            });
+        }
+        return {
+            title: '流程审批完成',
+            items: resultItems
+        } as FlowResultMessage;
+    }
+}
+
+
+export class FlowTrySubmitResultBuilder {
 
     private readonly data: any;
 
@@ -60,36 +89,6 @@ export class FlowSubmitResultBuilder {
 
 }
 
-
-export class FlowTrySubmitResultBuilder extends FlowWorkData {
-
-    constructor(data: any) {
-        super(data);
-    }
-
-    builder() {
-        const records = this.data.records;
-        const resultItems = [];
-        for (const record of records) {
-            const node = this.getNode(record.nodeCode);
-            resultItems.push({
-                label: '下级审批节点',
-                value: node.name
-            });
-
-            resultItems.push({
-                label: '下级审批人',
-                value: record.currentOperator.name
-            });
-        }
-        return {
-            title: '流程审批完成',
-            items: resultItems
-        } as FlowResultMessage;
-    }
-
-}
-
 export class FlowData extends FlowWorkData {
     private readonly formParams?: FlowFormParams;
 
diff --git a/admin-ui/src/components/Flow/flow/events.tsx b/admin-ui/src/components/Flow/flow/events.tsx
@@ -1,6 +1,6 @@
 import {useEffect} from "react";
 import {FormInstance} from "antd/es/form/hooks/useForm";
-import {FlowData, FlowSubmitResultBuilder} from "@/components/Flow/flow/data";
+import {FlowData, FlowSubmitResultBuilder, FlowTrySubmitResultBuilder} from "@/components/Flow/flow/data";
 import {custom, postponed, recall, saveFlow, startFlow, submitFlow, transfer, trySubmitFlow, urge} from "@/api/flow";
 import {message} from "antd";
 import {useDispatch, useSelector} from "react-redux";
@@ -360,7 +360,7 @@ export const registerEvents = (id: string,
             }
             case 'TRY_SUBMIT': {
                 handleTrySubmitFlow((res) => {
-                    const flowSubmitResultBuilder = new FlowSubmitResultBuilder(res.data);
+                    const flowSubmitResultBuilder = new FlowTrySubmitResultBuilder(res.data);
                     dispatch(showResult({
                         closeFlow: false,
                         result: flowSubmitResultBuilder.builder()
diff --git a/admin-ui/src/components/Flow/panel/ScriptModal.tsx b/admin-ui/src/components/Flow/panel/ScriptModal.tsx
@@ -1,8 +1,8 @@
 import React from "react";
 import {ModalForm, ProFormText} from "@ant-design/pro-components";
 import ProFormCode from "@/components/Form/ProFormCode";
-import "./ScriptModal.scss";
 import {EyeOutlined} from "@ant-design/icons";
+import "./ScriptModal.scss";
 
 interface ScriptModalProps {
     form: any;
@@ -104,7 +104,7 @@ def run(content){
     // 自定义返回标题并且关闭流程
     // return content.createMessageResult('我是自定义标题', true);
     // 自定义返回标题并添加现实内容
-    return content.createMessageResult('我是自定义标题', true).addMessage('我是标题1','我是内容2').addMessage('我是标题2','我是内容2');
+    return content.createMessageResult('我是自定义标题', true).addItem('我是标题1','我是内容2').addItem('我是标题2','我是内容2');
 }
 `
                    }
@@ -121,14 +121,18 @@ def run(content){
     // return content.createMessageResult('我是自定义标题', true);
     // 提交流程
     // content.submitFlow();
+    // 驳回流程
+    // content.rejectFlow();
     // 催办流程
     // content.urgeFlow();
     // 保存流程
     // content.saveFlow();
     // 撤回流程
     // content.recallFlow();
+    // 预提交流程
+    // content.trySubmitFlow();
     // 自定义返回标题并添加现实内容
-    return content.createMessageResult('我是自定义标题', true).addMessage('我是标题1','我是内容2').addMessage('我是标题2','我是内容2');
+    return content.createMessageResult('我是自定义标题', true).addMessage('我是标题1','我是内容2').addMessage('我是标题2','我是内容2').closeable(false);
 }
 `
                    }
diff --git a/example/example-application/pom.xml b/example/example-application/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.20</version>
+        <version>3.3.21</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-application/src/main/java/com/codingapi/example/pojo/cmd/FlowCmd.java b/example/example-application/src/main/java/com/codingapi/example/pojo/cmd/FlowCmd.java
@@ -36,7 +36,6 @@ public static class CustomFlow {
         private long recordId;
         private String buttonId;
         private String advice;
-        private boolean success;
         private JSONObject formData;
 
         @SneakyThrows
@@ -50,7 +49,7 @@ public String getUserName() {
         }
 
         public Opinion getOpinion() {
-            return new Opinion(advice, success ? Opinion.RESULT_PASS : Opinion.RESULT_REJECT, Opinion.TYPE_DEFAULT);
+            return new Opinion(advice, Opinion.RESULT_SAVE, Opinion.TYPE_DEFAULT);
         }
     }
 
diff --git a/example/example-domain/pom.xml b/example/example-domain/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.20</version>
+        <version>3.3.21</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-infra-flow/pom.xml b/example/example-infra-flow/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.20</version>
+        <version>3.3.21</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-infra-jpa/pom.xml b/example/example-infra-jpa/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.20</version>
+        <version>3.3.21</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-server/pom.xml b/example/example-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.20</version>
+        <version>3.3.21</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/pom.xml b/example/pom.xml
@@ -17,7 +17,7 @@
     </parent>
 
     <artifactId>springboot-example</artifactId>
-    <version>3.3.20</version>
+    <version>3.3.21</version>
 
     <name>springboot-example</name>
     <description>springboot-example project for Spring Boot</description>
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>3.3.20</version>
+    <version>3.3.21</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>
diff --git a/springboot-starter-data-fast/pom.xml b/springboot-starter-data-fast/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.20</version>
+        <version>3.3.21</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/springboot-starter-flow/pom.xml b/springboot-starter-flow/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.20</version>
+        <version>3.3.21</version>
     </parent>
 
     <name>springboot-starter-flow</name>
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/content/FlowSession.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/content/FlowSession.java
@@ -6,6 +6,8 @@
 import com.codingapi.springboot.flow.domain.Opinion;
 import com.codingapi.springboot.flow.error.NodeResult;
 import com.codingapi.springboot.flow.error.OperatorResult;
+import com.codingapi.springboot.flow.pojo.FlowResult;
+import com.codingapi.springboot.flow.pojo.FlowSubmitResult;
 import com.codingapi.springboot.flow.record.FlowRecord;
 import com.codingapi.springboot.flow.result.MessageResult;
 import com.codingapi.springboot.flow.service.FlowService;
@@ -95,6 +97,7 @@ public OperatorResult createOperatorErrTrigger(long... operatorIds) {
 
     /**
      * 创建流程提醒
+     *
      * @param title 提醒标题
      * @return 提醒对象
      */
@@ -104,7 +107,8 @@ public MessageResult createMessageResult(String title) {
 
     /**
      * 创建流程提醒
-     * @param title 提醒标题
+     *
+     * @param title     提醒标题
      * @param closeable 是否可关闭流程
      * @return 提醒对象
      */
@@ -115,8 +119,9 @@ public MessageResult createMessageResult(String title, boolean closeable) {
 
     /**
      * 创建流程提醒
-     * @param title 提醒标题
-     * @param items 提醒内容
+     *
+     * @param title     提醒标题
+     * @param items     提醒内容
      * @param closeable 是否可关闭流程
      * @return 提醒对象
      */
@@ -127,19 +132,45 @@ public MessageResult createMessageResult(String title, List<MessageResult.Messag
     /**
      * 提交流程
      */
-    public void submitFlsubmitFlowow() {
-        if(flowRecord==null){
+    public MessageResult submitFlow() {
+        if (flowRecord == null) {
+            throw new IllegalArgumentException("flow record is null");
+        }
+        FlowService flowService = loadFlowService();
+        FlowResult result = flowService.submitFlow(flowRecord.getId(), currentOperator, bindData, Opinion.pass(opinion.getAdvice()));
+        return MessageResult.create(result);
+    }
+
+    /**
+     * 驳回流程
+     */
+    public MessageResult rejectFlow() {
+        if (flowRecord == null) {
+            throw new IllegalArgumentException("flow record is null");
+        }
+        FlowService flowService = loadFlowService();
+        FlowResult result = flowService.submitFlow(flowRecord.getId(), currentOperator, bindData, Opinion.reject(opinion.getAdvice()));
+        return MessageResult.create(result);
+    }
+
+
+    /**
+     * 预提交流程
+     */
+    public MessageResult trySubmitFlow() {
+        if (flowRecord == null) {
             throw new IllegalArgumentException("flow record is null");
         }
         FlowService flowService = loadFlowService();
-        flowService.submitFlow(flowRecord.getId(), currentOperator, bindData, opinion);
+        FlowSubmitResult result = flowService.trySubmitFlow(flowRecord.getId(), currentOperator, bindData, Opinion.pass(opinion.getAdvice()));
+        return MessageResult.create(result);
     }
 
     /**
      * 保存流程
      */
     public void saveFlow() {
-        if(flowRecord==null){
+        if (flowRecord == null) {
             throw new IllegalArgumentException("flow record is null");
         }
         FlowService flowService = loadFlowService();
@@ -151,7 +182,7 @@ public void saveFlow() {
      * 催办流程
      */
     public void urgeFlow() {
-        if(flowRecord==null){
+        if (flowRecord == null) {
             throw new IllegalArgumentException("flow record is null");
         }
         FlowService flowService = loadFlowService();
@@ -162,7 +193,7 @@ public void urgeFlow() {
      * 撤回流程
      */
     public void recallFlow() {
-        if(flowRecord==null){
+        if (flowRecord == null) {
             throw new IllegalArgumentException("flow record is null");
         }
         FlowService flowService = loadFlowService();
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/result/MessageResult.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/result/MessageResult.java
diff --git a/springboot-starter-security/pom.xml b/springboot-starter-security/pom.xml
diff --git a/springboot-starter/pom.xml b/springboot-starter/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ public static class CustomFlow {`
`36`	`36`	`private long recordId;`
`37`	`37`	`private String buttonId;`
`38`	`38`	`private String advice;`
`39`		`- private boolean success;`
`40`	`39`	`private JSONObject formData;`
`41`	`40`
`42`	`41`	`@SneakyThrows`
`@@ -50,7 +49,7 @@ public String getUserName() {`
`50`	`49`	`}`
`51`	`50`
`52`	`51`	`public Opinion getOpinion() {`
`53`		`- return new Opinion(advice, success ? Opinion.RESULT_PASS : Opinion.RESULT_REJECT, Opinion.TYPE_DEFAULT);`
	`52`	`+ return new Opinion(advice, Opinion.RESULT_SAVE, Opinion.TYPE_DEFAULT);`
`54`	`53`	`}`
`55`	`54`	`}`
`56`	`55`