From 5bd1e846de7587f39d3edacfed58bfa8325c8758 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 30 一月 2026 15:09:07 +0800
Subject: [PATCH] 不合格管理：重新提交oa功能调整2

---
 inspect-server/src/main/java/com/ruoyi/inspect/controller/InsUnqualifiedHandlerController.java |   34 ++++++++++++++--------------------
 1 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsUnqualifiedHandlerController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsUnqualifiedHandlerController.java
index 035e565..dfcff39 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsUnqualifiedHandlerController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsUnqualifiedHandlerController.java
@@ -4,6 +4,7 @@
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.core.domain.Result;
 import com.ruoyi.common.oa.OAProcess;
 import com.ruoyi.inspect.dto.PushOADto;
@@ -20,7 +21,6 @@
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.HashMap;
-import java.util.Map;
 
 @RestController
 @Api("涓嶅悎鏍煎鐞嗙鐞�")
@@ -34,15 +34,11 @@
     private static final String REQUESTID = "requestId";
     private static final String CHECKRESULT = "CHECKRESULT";
 
-
-
-
     @ApiOperation(value = "鎻愪氦OA")
     @PostMapping("/pushOA")
     public Result pushOA(@RequestBody PushOADto pushOADto){
         return unqualifiedHandlerService.pushOA(pushOADto);
     }
-
 
     @ApiOperation(value = "鏌ヨ")
     @GetMapping("/page")
@@ -50,21 +46,19 @@
         return Result.success(unqualifiedHandlerService.pageList(page, unqualifiedHandlerDto));
     }
 
-
-
     @ApiOperation(value = "闄勪欢涓婁紶")
     @PostMapping("/uploadFileByUnqualified")
     public Result<?> uploadFileByUnqualified(Long handlerId, MultipartFile file) {
         return Result.success(unqualifiedHandlerFileService.uploadFile(handlerId, file));
     }
 
-
+    @Anonymous
     @ApiOperation(value = "涓嶅悎鏍煎鐞哋A鍥炶皟")
     @RequestMapping(value = "/callback", produces = "text/plain")
     public String unqualifiedHandlerOACallback(String data){
         String msg = OAProcess.oaReturnMsg(0, "success");
         JSONObject json = JSONObject.parseObject(data);
-        System.out.println("========>" + json);
+        log.info("oa鍥炶皟鍙傛暟========>" + json);
         try {
             Long oaWorkId = json.getLong(REQUESTID);
             String checkResult = json.getString(CHECKRESULT);
@@ -72,10 +66,10 @@
             JSONArray objects = JSONArray.parseArray(JSONObject.toJSONString(o));
             unqualifiedHandlerService.unqualifiedHandlerOACallback(oaWorkId, checkResult,objects);
         } catch (Exception e) {
-            System.out.println(e.getMessage());
+            log.error("oa鍥炶皟澶辫触: " + e.getMessage());
             msg = OAProcess.oaReturnMsg(1, "oa鍥炶皟澶辫触: " + e.getMessage());
         }
-        System.out.println("oa鍥炶皟杩斿洖缁撴灉========>" + msg);
+        log.info("oa鍥炶皟杩斿洖缁撴灉========>" + msg);
         return msg;
     }
 
@@ -89,20 +83,17 @@
         unqualifiedHandlerFileService.downloadOAFile(handlerFileId,response);
     }
 
-
     @ApiOperation(value = "鏂板涓嶅悎鏍煎鐞�")
     @PostMapping("/addUnqualifiedHandler")
     public Result addUnqualifiedHandler(@RequestBody UnqualifiedHandlerDto unqualifiedHandlerDto){
         return Result.success(unqualifiedHandlerService.addUnqualifiedHandler(unqualifiedHandlerDto));
     }
 
-
-    @ApiOperation(value = "缂栬緫涓嶅悎鏍煎鐞�")
-    @PostMapping("/updateUnqualifiedHandler")
+    @ApiOperation(value = "缂栬緫涓嶅悎鏍煎鐞嗗苟涓旀帹閫丱A")
+    @PostMapping("/reSubmitPushOa")
     public Result updateUnqualifiedHandler(@RequestBody UnqualifiedHandlerDto unqualifiedHandlerDto){
         return Result.success(unqualifiedHandlerService.updateUnqualifiedHandler(unqualifiedHandlerDto));
     }
-
 
     @ApiOperation(value = "鏌ョ湅oa娴佺▼")
     @GetMapping("/getOaFlow")
@@ -110,21 +101,17 @@
         return Result.success(unqualifiedHandlerService.getOaFlow(id));
     }
 
-
-
     @ApiOperation(value = "鏌ョ湅涓嶅悎鏍煎鐞嗙晫闈�")
     @GetMapping("/getUnqualifiedHandler")
     public Result getUnqualifiedHandler(Integer id){
         return Result.success(unqualifiedHandlerService.getUnqualifiedHandler(id));
     }
 
-
     @ApiOperation(value = "鍒犻櫎涓嶅悎鏍煎鐞�")
     @DeleteMapping("/deleteUnqualifiedHandler")
     public Result deleteUnqualifiedHandler(Integer id) {
         return Result.success(unqualifiedHandlerService.deleteUnqualifiedHandler(id));
     }
-
 
     @ApiOperation(value = "涓嬭浇闄勪欢")
     @GetMapping("/downFile")
@@ -136,4 +123,11 @@
         return Result.success(map);
     }
 
+    @ApiOperation(value = "瀵煎嚭涓嶅悎鏍煎鐞嗚褰�")
+    @GetMapping("/exportUnqualifiedHandler")
+    public void exportUnqualifiedHandler(UnqualifiedHandlerDto unqualifiedHandlerDto,HttpServletResponse response) {
+        unqualifiedHandlerService.exportUnqualifiedHandler(unqualifiedHandlerDto,response);
+    }
+
+
 }

--
Gitblit v1.9.3