From 2cf06285f64311722cbf79fd5635b16718635e5e Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 12 六月 2026 18:07:16 +0800
Subject: [PATCH] 不合格处理：支持多生产批次提交oa；oa流程查看调整
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsUnqualifiedHandlerController.java | 49 ++++++++++++++++++++++---------------------------
1 files changed, 22 insertions(+), 27 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..af57065 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
@@ -1,7 +1,6 @@
package com.ruoyi.inspect.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Anonymous;
@@ -21,7 +20,6 @@
import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
-import java.util.Map;
@RestController
@Api("涓嶅悎鏍煎鐞嗙鐞�")
@@ -35,15 +33,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,7 +45,11 @@
return Result.success(unqualifiedHandlerService.pageList(page, unqualifiedHandlerDto));
}
-
+ @ApiOperation(value = "鏌ヨ涓嶅悎鏍煎鐞嗚褰�")
+ @GetMapping("/getList")
+ public Result getList(){
+ return Result.success(unqualifiedHandlerService.getList());
+ }
@ApiOperation(value = "闄勪欢涓婁紶")
@PostMapping("/uploadFileByUnqualified")
@@ -59,25 +57,22 @@
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);
+ JSONObject response = JSONObject.parseObject(data);
+ log.info("oa鍥炶皟鍙傛暟========>" + response);
try {
- Long oaWorkId = json.getLong(REQUESTID);
- String checkResult = json.getString(CHECKRESULT);
- Object o = json.get("workflowRequestLogs");
- JSONArray objects = JSONArray.parseArray(JSONObject.toJSONString(o));
- unqualifiedHandlerService.unqualifiedHandlerOACallback(oaWorkId, checkResult,objects);
+ Long oaWorkId = response.getLong(REQUESTID);
+ String checkResult = response.getString(CHECKRESULT);
+ unqualifiedHandlerService.unqualifiedHandlerOACallback(oaWorkId, checkResult,response);
} catch (Exception e) {
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 +86,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 +104,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));
+ public Result deleteUnqualifiedHandler(String groupId) {
+ return Result.success(unqualifiedHandlerService.deleteUnqualifiedHandler(groupId));
}
-
@ApiOperation(value = "涓嬭浇闄勪欢")
@GetMapping("/downFile")
@@ -138,4 +126,11 @@
return Result.success(map);
}
+ @ApiOperation(value = "瀵煎嚭涓嶅悎鏍煎鐞嗚褰�")
+ @GetMapping("/exportUnqualifiedHandler")
+ public void exportUnqualifiedHandler(UnqualifiedHandlerDto unqualifiedHandlerDto,HttpServletResponse response) {
+ unqualifiedHandlerService.exportUnqualifiedHandler(unqualifiedHandlerDto,response);
+ }
+
+
}
--
Gitblit v1.9.3