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 | 30 +++++++++++-------------------
1 files changed, 11 insertions(+), 19 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 6712b95..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
@@ -21,7 +21,6 @@
import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
-import java.util.Map;
@RestController
@Api("涓嶅悎鏍煎鐞嗙鐞�")
@@ -35,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")
@@ -51,14 +46,11 @@
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鍥炶皟")
@@ -66,7 +58,7 @@
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);
@@ -77,7 +69,7 @@
log.error("oa鍥炶皟澶辫触: " + e.getMessage());
msg = OAProcess.oaReturnMsg(1, "oa鍥炶皟澶辫触: " + e.getMessage());
}
- System.out.println("oa鍥炶皟杩斿洖缁撴灉========>" + msg);
+ log.info("oa鍥炶皟杩斿洖缁撴灉========>" + msg);
return msg;
}
@@ -91,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")
@@ -112,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")
@@ -138,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