From a2b245ca94dafa6e89d11d3fc9790431d9f36d20 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 14 Jan 2026 15:48:46 +0800 Subject: [PATCH] =?UTF-8?q?2026-01-14=20oa=E4=B8=8B=E8=BE=BE=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=B8=80=E4=B8=AA=E9=80=BB=E8=BE=91=20=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E8=8A=82=E7=82=B9isRemark=3D4=EF=BC=8C=E8=AF=B4?= =?UTF-8?q?=E6=98=8E=E7=9B=B4=E6=8E=A5=E5=BD=92=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ChangeManagementServiceImpl.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java index d91c5e2b..8f356a3b 100644 --- a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java +++ b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java @@ -1180,6 +1180,31 @@ public class ChangeManagementServiceImpl extends ServiceImpl>>(){}); } + + // 如果节点isRemark=4,说明直接归档 + List> archiveRemarks = res.stream().filter(a -> convertToInt(a.get("isremark")) == 4).collect(Collectors.toList()); + if (!archiveRemarks.isEmpty()) { + // 反刷单据状态为 "已完成" + paramData.setStatus("已完成"); + // 查最后一个节点的stepId + List nodeDetailLast = changeManagementMapper.queryNodeDetailLast(paramData.getSite(), paramData.getClassificationNo(), paramData.getWorkflowId()); + paramData.setStepId(nodeDetailLast.get(0).getStepId()); + changeManagementMapper.updateChangeStatus2(paramData); + + // 删除异构系统指定人员待办流程 + DeleteUserRequestInfoParam deleteUserRequestInfoParam = new DeleteUserRequestInfoParam(); + deleteUserRequestInfoParam.setRequestId(paramData.getWorkflowId() + paramData.getRequestId()); + deleteUserRequestInfoParam.setSyscode("PLM"); + List oaUserList = changeManagementMapper.getOaUserIdByIsRemark(paramData.getSite(), paramData.getDocNo(), "0"); + for (OaUserData oaUser : oaUserList) { + deleteUserRequestInfoParam.setUserId(oaUser.getId()); + String deleteUserRequestInfoURL = apiUrlOa + "/oa/interface/deleteUserRequestInfo"; + ResponseData deleteUserRequestInfoResponses = HttpClientUtil.doPostByRawWithOA(deleteUserRequestInfoURL, deleteUserRequestInfoParam); + } + // 直接归档,不再继续后续流程 + return; + } + // 得到isRemark为0的流转信息 List> isRemarks = res.stream().filter(a -> convertToInt(a.get("isremark")) == 0).collect(Collectors.toList()); if (isRemarks.isEmpty()) {