From b0cce93617ea3d4940f1304f2150d8481e1b8a2b Mon Sep 17 00:00:00 2001
From: 上海郢昱 <15922366+miu-haiqing@user.noreply.gitee.com>
Date: 星期一, 07 九月 2026 15:33:20 +0800
Subject: [PATCH] 不合格处理：OA回调新增结束标识字段，每个节点审批结束都更新一次流程信息
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsUnqualifiedHandlerController.java | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 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 722aee0..5cf0f2a 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("涓嶅悎鏍煎鐞嗙鐞�")
@@ -34,9 +32,7 @@
private final InsUnqualifiedHandlerFileService unqualifiedHandlerFileService;
private static final String REQUESTID = "requestId";
private static final String CHECKRESULT = "CHECKRESULT";
-
-
-
+ private static final String ENDFLAG = "jsbs";//缁撴潫鏍囪瘑锛屽彧鏈夐��鍥�/缁撴潫绛変簬1
@ApiOperation(value = "鎻愪氦OA")
@PostMapping("/pushOA")
@@ -44,14 +40,17 @@
return unqualifiedHandlerService.pushOA(pushOADto);
}
-
@ApiOperation(value = "鏌ヨ")
@GetMapping("/page")
public Result pageByUnqualified(Page page, UnqualifiedHandlerDto unqualifiedHandlerDto){
return Result.success(unqualifiedHandlerService.pageList(page, unqualifiedHandlerDto));
}
-
+ @ApiOperation(value = "鏌ヨ涓嶅悎鏍煎鐞嗚褰�")
+ @GetMapping("/getList")
+ public Result getList(){
+ return Result.success(unqualifiedHandlerService.getList());
+ }
@ApiOperation(value = "闄勪欢涓婁紶")
@PostMapping("/uploadFileByUnqualified")
@@ -59,20 +58,18 @@
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);
- log.info("oa鍥炶皟鍙傛暟========>" + 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);
+ String endFlag = response.getString(ENDFLAG);
+ unqualifiedHandlerService.unqualifiedHandlerOACallback(oaWorkId, checkResult,endFlag,response);
} catch (Exception e) {
log.error("oa鍥炶皟澶辫触: " + e.getMessage());
msg = OAProcess.oaReturnMsg(1, "oa鍥炶皟澶辫触: " + e.getMessage());
@@ -117,8 +114,8 @@
@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 = "涓嬭浇闄勪欢")
--
Gitblit v1.9.3