From 1becd6d46123723bd2b898fd565b4331fb2cb2d8 Mon Sep 17 00:00:00 2001
From: lyh <liuyuanheng@xalxzn.com>
Date: 星期五, 28 二月 2025 15:51:50 +0800
Subject: [PATCH] 新增flow able 代办已办

---
 lxzn-module-dnc/src/main/java/org/jeecg/modules/flow/controller/AssignFileStreamController.java |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/flow/controller/AssignFileStreamController.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/flow/controller/AssignFileStreamController.java
index c989068..7424f7a 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/flow/controller/AssignFileStreamController.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/flow/controller/AssignFileStreamController.java
@@ -12,6 +12,7 @@
 import org.jeecg.modules.flow.request.AssignFileRequest;
 import org.jeecg.modules.flow.request.AssignFileStreamQueryRequest;
 import org.jeecg.modules.dnc.response.*;
+import org.jeecg.modules.flow.vo.AssignFlowTaskVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -28,20 +29,15 @@
     @AutoLog(value = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鍚姩娴佺▼ 淇濆瓨鐩稿簲鐨勬暟鎹� 缁戝畾businessKey")
     @ApiOperation(value = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鍚姩娴佺▼ 淇濆瓨鐩稿簲鐨勬暟鎹� 缁戝畾businessKey", notes = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鍚姩娴佺▼ 淇濆瓨鐩稿簲鐨勬暟鎹� 缁戝畾businessKey")
     @PostMapping("/assign/file/apply")
-    public ResponseResult applyAssignFile(@RequestBody AssignFileStream stream) {
-        ResponseResult b = assignFileStreamService.applyAssignFile(stream);
-        if(b.isSuccess()) {
-            return new ResponseResult(CommonCode.SUCCESS);
-        }
-        return b;
+    public Result<?> applyAssignFile(@RequestBody AssignFileStream stream) {
+        return assignFileStreamService.applyAssignFile(stream);
     }
 
     @AutoLog(value = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-瀹℃壒鏈嶅姟")
     @ApiOperation(value = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-瀹℃壒鏈嶅姟", notes = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-瀹℃壒鏈嶅姟")
-    @PostMapping("/assign/file/approve/{taskId}/{streamId}")
-    public ResponseResult approveAssignFile(@PathVariable("taskId") String taskId, @PathVariable("streamId") String streamId,
-                                            @RequestBody AssignFileStream stream) {
-        boolean b = assignFileStreamService.approveAssignFile(taskId, streamId, stream);
+    @PostMapping("/assign/file/approve")
+    public ResponseResult approveAssignFile(@RequestBody AssignFlowTaskVo assignFlowTaskVo) {
+        boolean b = assignFileStreamService.approveAssignFile(assignFlowTaskVo);
         if(b)
             return new ResponseResult(CommonCode.SUCCESS);
         return new ResponseResult(CommonCode.FAIL);
@@ -108,4 +104,9 @@
             return new ResponseResult(CommonCode.SUCCESS);
         return new ResponseResult(CommonCode.FAIL);
     }
+
+    @GetMapping(value = "/selectVoById")
+    public Result<AssignFileStream> selectVoById(@RequestParam(name="id") String id){
+        return Result.OK(assignFileStreamService.getAssignFileStreamDetail(id));
+    }
 }

--
Gitblit v1.9.3