From e6176f42c14269c6ef351d9afb1149910576e339 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Mon, 12 May 2025 13:25:26 +0800 Subject: [PATCH] =?UTF-8?q?2025-05-12=20=E5=88=A0=E9=99=A4=E5=BC=82?= =?UTF-8?q?=E6=9E=84=E7=B3=BB=E7=BB=9F=E6=8C=87=E5=AE=9A=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=BE=85=E5=8A=9E=E6=B5=81=E7=A8=8B=E5=BC=82=E5=B8=B8=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=20=E4=BD=BF=E7=94=A8=20process=5Fform=20=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=20site=20documentNo=20isRemark=20=3D=200=20=E6=9D=A5?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=BA=BA=E5=91=98=20=E5=8F=AF=E8=83=BD?= =?UTF-8?q?=E6=9C=89=E5=A4=9A=E4=B8=AA=20=E5=BE=AA=E7=8E=AF=E8=B0=83?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../change/mapper/ChangeManagementMapper.java | 3 ++ .../impl/ChangeManagementServiceImpl.java | 49 +++++++++++-------- .../mapper/change/ChangeManagementMapper.xml | 8 +++ 3 files changed, 39 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java b/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java index 2ba010dd..0443b8b5 100644 --- a/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java +++ b/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java @@ -3,6 +3,7 @@ package com.spring.modules.change.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.spring.modules.base.data.OaUserData; import com.spring.modules.base.data.PlmPropertiesItemAvailableData; import com.spring.modules.base.data.PlmPropertiesItemData; import com.spring.modules.base.data.PlmPropertiesModelHeaderData; @@ -178,4 +179,6 @@ public interface ChangeManagementMapper extends BaseMapper{ @Param("updateBy") String userName, @Param("updateDate") String stringNow, @Param("rejectOpinion") String rejectOpinion, @Param("menuName") String menuName, @Param("type") String type); IPage choosePartNoList(Page plmProjectPartDataPage, @Param("query") PlmProjectPartData data); + + List getOaUserIdByIsRemark(@Param("site") String site, @Param("docNo") String docNo, @Param("isRemark") String isRemark); } 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 38116e7a..4f9966a6 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 @@ -1539,17 +1539,22 @@ public class ChangeManagementServiceImpl extends ServiceImpl oaUserList = changeManagementMapper.getOaUserIdByIsRemark(paramData.getSite(), paramData.getDocNo(), "0"); + // 如果 isRemarks 中的节点ID = 最新节点ID if (isRemarks.get(0).get("nodeid").toString().equals(newNodeId) && !pfs.isEmpty()) { // 2025-05-09 发送统一待办前先调用[删除异构系统指定人员待办流程]接口 - DeleteUserRequestInfoParam deleteUserRequestInfoParam = new DeleteUserRequestInfoParam(); - deleteUserRequestInfoParam.setUserId(paramData.getUserId()); - deleteUserRequestInfoParam.setRequestId(paramData.getRequestId()); - deleteUserRequestInfoParam.setSyscode("PLM"); - String deleteUserRequestInfoURL = apiUrlOa + "/oa/interface/deleteUserRequestInfo"; - ResponseData deleteUserRequestInfoResponses = HttpClientUtil.doPostByRawWithOA(deleteUserRequestInfoURL, deleteUserRequestInfoParam); - if (!"0".equals(deleteUserRequestInfoResponses.getCode())) { - throw new RuntimeException("删除异构系统指定人员待办流程异常信息：" + deleteUserRequestInfoResponses.getMsg()); + for (OaUserData oaUser : oaUserList) { + deleteUserRequestInfoParam.setUserId(oaUser.getId()); + String deleteUserRequestInfoURL = apiUrlOa + "/oa/interface/deleteUserRequestInfo"; + ResponseData deleteUserRequestInfoResponses = HttpClientUtil.doPostByRawWithOA(deleteUserRequestInfoURL, deleteUserRequestInfoParam); + if (!"0".equals(deleteUserRequestInfoResponses.getCode())) { + throw new RuntimeException("删除异构系统指定人员待办流程异常信息：" + deleteUserRequestInfoResponses.getMsg()); + } } // 发送代办 @@ -1650,14 +1655,13 @@ public class ChangeManagementServiceImpl extends ServiceImpl 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); + if (!"0".equals(deleteUserRequestInfoResponses.getCode())) { + throw new RuntimeException("删除异构系统指定人员待办流程异常信息：" + deleteUserRequestInfoResponses.getMsg()); + } } // 9、统一待办接口 diff --git a/src/main/resources/mapper/change/ChangeManagementMapper.xml b/src/main/resources/mapper/change/ChangeManagementMapper.xml index 6809751f..e062bca8 100644 --- a/src/main/resources/mapper/change/ChangeManagementMapper.xml +++ b/src/main/resources/mapper/change/ChangeManagementMapper.xml @@ -1311,4 +1311,12 @@ +