fix #123

Author: xlorne

admin-ui/package.json

@@ -6,9 +6,9 @@
     "@ant-design/icons": "^5.4.0",
     "@ant-design/pro-components": "^2.8.7",
     "@babel/standalone": "^7.25.6",
-    "@codingapi/flow-pc": "^0.0.41",
-    "@codingapi/form-pc": "^0.0.41",
-    "@codingapi/ui-framework": "^0.0.41",
+    "@codingapi/flow-pc": "^0.0.42",
+    "@codingapi/form-pc": "^0.0.42",
+    "@codingapi/ui-framework": "^0.0.42",
     "@dnd-kit/core": "^6.2.0",
     "@dnd-kit/sortable": "^9.0.0",
     "@handsontable/react-wrapper": "^15.0.0",

admin-ui/src/api/flow.ts

@@ -87,6 +87,14 @@ export async function urge(body:any) {
     return httpClient.post('/api/cmd/flowRecord/urge', body);
 }
 
+export async function back(body:any) {
+    return httpClient.post('/api/cmd/flowRecord/back', body);
+}
+
+export async function voided(body:any) {
+    return httpClient.post('/api/cmd/flowRecord/voided', body);
+}
+
 
 // 待办中心控制
 

admin-ui/src/components/flow/register.tsx

@@ -60,6 +60,22 @@ class DefaultFlowApiImpl implements FlowApi{
         return flowApi.detail(null,workCode);
     }
 
+    backFlow(body: any): Promise<any> {
+        return flowApi.back(body);
+    }
+
+    voidedFlow(body: any): Promise<any> {
+        return flowApi.voided(body);
+    }
+
+    getFlowStep(recordId?: number, workCode?: string): Promise<any> {
+        const body = {
+            recordId,
+            workCode
+        }
+        return flowApi.getFlowStep(body);
+    }
+
 }
 
 FlowApiContent.getInstance().registerFlowApi(new DefaultFlowApiImpl());

example/example-app/example-app-cmd-meta/src/main/java/com/codingapi/example/app/cmd/meta/pojo/FlowCmd.java

@@ -213,6 +213,29 @@ public String getUserName() {
     }
 
 
+    @Setter
+    @Getter
+    public static class BackFlow {
+
+        private String processId;
+        private String backNodeCode;
+
+        public String getUserName() {
+            return TokenContext.current().getUsername();
+        }
+    }
+
+    @Setter
+    @Getter
+    public static class VoidedFlow {
+
+        private String processId;
+
+        public String getUserName() {
+            return TokenContext.current().getUsername();
+        }
+    }
+
     @Setter
     @Getter
     public static class PostponedFlow {

example/example-app/example-app-cmd-meta/src/main/java/com/codingapi/example/app/cmd/meta/service/FlowRecordRouter.java

@@ -93,4 +93,14 @@ public void remove(FlowCmd.RemoveFlow request) {
         IFlowOperator current = flowUserRepository.getUserByUsername(request.getUserName());
         flowService.remove(request.getRecordId(), current);
     }
+
+    public void back(FlowCmd.BackFlow request) {
+        IFlowOperator current = flowUserRepository.getUserByUsername(request.getUserName());
+        flowService.back(request.getProcessId(),request.getBackNodeCode(), current);
+    }
+
+    public void voided(FlowCmd.VoidedFlow request) {
+        IFlowOperator current = flowUserRepository.getUserByUsername(request.getUserName());
+        flowService.voided(request.getProcessId(), current);
+    }
 }

example/example-interface/src/main/java/com/codingapi/example/api/meta/FlowRecordCmdController.java

@@ -84,4 +84,17 @@ public Response remove(@RequestBody FlowCmd.RemoveFlow request) {
         return Response.buildSuccess();
     }
 
+
+    @PostMapping("/back")
+    public Response back(@RequestBody FlowCmd.BackFlow request) {
+        flowRecordRouter.back(request);
+        return Response.buildSuccess();
+    }
+
+
+    @PostMapping("/voided")
+    public Response voided(@RequestBody FlowCmd.VoidedFlow request) {
+        flowRecordRouter.voided(request);
+        return Response.buildSuccess();
+    }
 }

mobile-ui/package.json

@@ -4,9 +4,9 @@
   "private": true,
   "dependencies": {
     "@babel/standalone": "^7.25.6",
-    "@codingapi/flow-mobile": "^0.0.41",
-    "@codingapi/form-mobile": "^0.0.41",
-    "@codingapi/ui-framework": "^0.0.41",
+    "@codingapi/flow-mobile": "^0.0.42",
+    "@codingapi/form-mobile": "^0.0.42",
+    "@codingapi/ui-framework": "^0.0.42",
     "@logicflow/core": "^2.0.10",
     "@logicflow/extension": "^2.0.14",
     "@reduxjs/toolkit": "^2.2.7",

mobile-ui/src/api/flow.ts

@@ -94,6 +94,16 @@ export async function urge(body:any) {
 }
 
 
+export async function back(body:any) {
+    return httpClient.post('/api/cmd/flowRecord/back', body);
+}
+
+export async function voided(body:any) {
+    return httpClient.post('/api/cmd/flowRecord/voided', body);
+}
+
+
+
 // 待办中心控制
 
 export async function findAllByOperatorId( lastId?: string,

mobile-ui/src/components/flow/register.tsx

@@ -61,6 +61,22 @@ class DefaultFlowApiImpl implements FlowApi{
         return flowApi.detail(null,workCode);
     }
 
+    backFlow(body: any): Promise<any> {
+        return flowApi.back(body);
+    }
+
+    voidedFlow(body: any): Promise<any> {
+        return flowApi.voided(body);
+    }
+
+    getFlowStep(recordId?: number, workCode?: string): Promise<any> {
+        const body = {
+            recordId,
+            workCode
+        }
+        return flowApi.getFlowStep(body);
+    }
+
 }
 
 FlowApiContent.getInstance().registerFlowApi(new DefaultFlowApiImpl());