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 | 4 +++-
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsUnqualifiedHandlerServiceImpl.java | 6 ++++--
inspect-server/src/main/java/com/ruoyi/inspect/service/InsUnqualifiedHandlerService.java | 2 +-
3 files changed, 8 insertions(+), 4 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 af57065..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
@@ -32,6 +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")
@@ -67,7 +68,8 @@
try {
Long oaWorkId = response.getLong(REQUESTID);
String checkResult = response.getString(CHECKRESULT);
- unqualifiedHandlerService.unqualifiedHandlerOACallback(oaWorkId, checkResult,response);
+ 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());
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsUnqualifiedHandlerService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsUnqualifiedHandlerService.java
index 8e185f0..d16d900 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsUnqualifiedHandlerService.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsUnqualifiedHandlerService.java
@@ -27,7 +27,7 @@
Result pushOA(PushOADto pushOADto);
- void unqualifiedHandlerOACallback(Long oaWorkId, String checkResult, JSONObject response);
+ void unqualifiedHandlerOACallback(Long oaWorkId, String checkResult,String endFlag, JSONObject response);
List<CommonOa> getOaFlow(Integer id);
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsUnqualifiedHandlerServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsUnqualifiedHandlerServiceImpl.java
index 353ca69..4b910ca 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsUnqualifiedHandlerServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsUnqualifiedHandlerServiceImpl.java
@@ -212,7 +212,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void unqualifiedHandlerOACallback(Long oaWorkId, String checkResult, JSONObject response) {
+ public void unqualifiedHandlerOACallback(Long oaWorkId, String checkResult,String endFlag, JSONObject response) {
// 娌℃湁杩欎釜灏辩粨鏉�
Long count1 = baseMapper.selectCount(Wrappers.<InsUnqualifiedHandler>lambdaQuery()
.eq(InsUnqualifiedHandler::getRequestId, Integer.valueOf(String.valueOf(oaWorkId))));
@@ -225,10 +225,12 @@
clcsMap.put("1","閫�璐�");
clcsMap.put("2","閮ㄥ垎閫�璐�");
clcsMap.put("3","闄嶇骇浣跨敤");
+ //娴佺▼缁撴潫鎵嶄慨鏀筼a鐘舵��
+ boolean hasChangeOaState = StringUtils.isNotBlank(endFlag) && endFlag.equals("1");
//oa鐘舵�侊細3閫氳繃 4椹冲洖
Integer oaState = "1".equals(checkResult) ? 3 : 4;
baseMapper.update(null, new LambdaUpdateWrapper<InsUnqualifiedHandler>()
- .set(InsUnqualifiedHandler::getOaState, oaState)
+ .set(hasChangeOaState,InsUnqualifiedHandler::getOaState, oaState)
.set(InsUnqualifiedHandler::getClassification,response.getString("flclassification"))
.eq(InsUnqualifiedHandler::getRequestId, Integer.valueOf(String.valueOf(oaWorkId))));
//淇濆瓨oa瀹℃壒娴佺▼璁板綍
--
Gitblit v1.9.3