From 68d6ddbe1610b66e75ee05ad75998ce1a3caadba Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 29 一月 2026 16:30:35 +0800
Subject: [PATCH] 不合格管理：重新提交oa功能调整
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsUnqualifiedHandlerController.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 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..722aee0 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;
@@ -59,12 +60,13 @@
}
+ @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 +74,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 +91,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 +109,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 +131,11 @@
return Result.success(map);
}
+ @ApiOperation(value = "瀵煎嚭涓嶅悎鏍煎鐞嗚褰�")
+ @GetMapping("/exportUnqualifiedHandler")
+ public void exportUnqualifiedHandler(UnqualifiedHandlerDto unqualifiedHandlerDto,HttpServletResponse response) {
+ unqualifiedHandlerService.exportUnqualifiedHandler(unqualifiedHandlerDto,response);
+ }
+
+
}
--
Gitblit v1.9.3