2024-05-31

src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java

@@ -128,7 +128,7 @@ public interface ChangeManagementMapper extends BaseMapper<ChangeRequestEntity>{
 
     void updateProcessReject(@Param("site") String site, @Param("bu") String bu, @Param("requestId") String requestId, @Param("domainControlAccount") String domainControlAccount);
 
-    ProcessFormEntity getProcessNodeId(@Param("site") String site, @Param("bu") String bu, @Param("requestId") String requestId, @Param("domainControlAccount") String domainControlAccount);
+    List<ProcessFormEntity> getProcessNodeId(@Param("site") String site, @Param("bu") String bu, @Param("requestId") String requestId, @Param("domainControlAccount") String domainControlAccount);
 
     String getNodeName(@Param("site") String site, @Param("classificationNo") String classificationNo, @Param("nodeId") String nodeId);
 

src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java

@@ -1465,8 +1465,8 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
             changeManagementMapper.updateChangeReject(data);
             // 修改当前流程记录的退回标记为Y，并记录当前节点
             changeManagementMapper.updateProcessReject(data.getSite(), data.getBu(), requestId, user.getDomainControlAccount());
-            ProcessFormEntity processForm = changeManagementMapper.getProcessNodeId(data.getSite(), data.getBu(), requestId, user.getDomainControlAccount());
-
+            List<ProcessFormEntity> processFormList2 = changeManagementMapper.getProcessNodeId(data.getSite(), data.getBu(), requestId, user.getDomainControlAccount());
+            ProcessFormEntity processForm = processFormList2.get(0);
             // 获取流程流转信息
             RequestOperatorInfoParam requestOperatorInfoParam = new RequestOperatorInfoParam();
             requestOperatorInfoParam.setUserId(userId);
@@ -1950,8 +1950,8 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
         changeManagementMapper.updateChangeReject2(paramData);
         // 修改当前流程记录的退回标记为Y，并记录当前节点
         changeManagementMapper.updateProcessReject(paramData.getSite(), paramData.getBu(), paramData.getRequestId(), paramData.getDomainControlAccount());
-        ProcessFormEntity processForm = changeManagementMapper.getProcessNodeId(paramData.getSite(), paramData.getBu(), paramData.getRequestId(), paramData.getDomainControlAccount());
-
+        List<ProcessFormEntity> processFormList = changeManagementMapper.getProcessNodeId(paramData.getSite(), paramData.getBu(), paramData.getRequestId(), paramData.getDomainControlAccount());
+        ProcessFormEntity processForm = processFormList.get(0);
         // 获取流程流转信息
         RequestOperatorInfoParam requestOperatorInfoParam = new RequestOperatorInfoParam();
         requestOperatorInfoParam.setUserId(paramData.getUserId());

src/main/java/com/spring/modules/proofing/service/impl/ProofingInformationServiceImpl.java

@@ -816,8 +816,8 @@ public class ProofingInformationServiceImpl extends ServiceImpl<ProofingInformat
         changeManagementMapper.updateChangeReject2(paramData);
         // 修改当前流程记录的退回标记为Y，并记录当前节点
         changeManagementMapper.updateProcessReject(paramData.getSite(), paramData.getBu(), paramData.getRequestId(), paramData.getDomainControlAccount());
-        ProcessFormEntity processForm = changeManagementMapper.getProcessNodeId(paramData.getSite(), paramData.getBu(), paramData.getRequestId(), paramData.getDomainControlAccount());
-
+        List<ProcessFormEntity> processFormList = changeManagementMapper.getProcessNodeId(paramData.getSite(), paramData.getBu(), paramData.getRequestId(), paramData.getDomainControlAccount());
+        ProcessFormEntity processForm = processFormList.get(0);
         // 获取流程流转信息
         RequestOperatorInfoParam requestOperatorInfoParam = new RequestOperatorInfoParam();
         requestOperatorInfoParam.setUserId(paramData.getUserId());

src/main/java/com/spring/modules/quotation/service/impl/QuotationInformationServiceImpl.java

@@ -1097,8 +1097,8 @@ public class QuotationInformationServiceImpl extends ServiceImpl<QuotationInform
         changeManagementMapper.updateChangeReject2(paramData);
         // 修改当前流程记录的退回标记为Y，并记录当前节点
         changeManagementMapper.updateProcessReject(paramData.getSite(), paramData.getBu(), paramData.getRequestId(), paramData.getDomainControlAccount());
-        ProcessFormEntity processForm = changeManagementMapper.getProcessNodeId(paramData.getSite(), paramData.getBu(), paramData.getRequestId(), paramData.getDomainControlAccount());
-
+        List<ProcessFormEntity> processFormList = changeManagementMapper.getProcessNodeId(paramData.getSite(), paramData.getBu(), paramData.getRequestId(), paramData.getDomainControlAccount());
+        ProcessFormEntity processForm = processFormList.get(0);
         // 获取流程流转信息
         RequestOperatorInfoParam requestOperatorInfoParam = new RequestOperatorInfoParam();
         requestOperatorInfoParam.setUserId(paramData.getUserId());

src/main/java/com/spring/modules/test/service/impl/TestInformationServiceImpl.java

@@ -720,8 +720,8 @@ public class TestInformationServiceImpl extends ServiceImpl<TestInformationMappe
         changeManagementMapper.updateChangeReject2(paramData);
         // 修改当前流程记录的退回标记为Y，并记录当前节点
         changeManagementMapper.updateProcessReject(paramData.getSite(), paramData.getBu(), paramData.getRequestId(), paramData.getDomainControlAccount());
-        ProcessFormEntity processForm = changeManagementMapper.getProcessNodeId(paramData.getSite(), paramData.getBu(), paramData.getRequestId(), paramData.getDomainControlAccount());
-
+        List<ProcessFormEntity> processFormList  = changeManagementMapper.getProcessNodeId(paramData.getSite(), paramData.getBu(), paramData.getRequestId(), paramData.getDomainControlAccount());
+        ProcessFormEntity processForm = processFormList.get(0);
         // 获取流程流转信息
         RequestOperatorInfoParam requestOperatorInfoParam = new RequestOperatorInfoParam();
         requestOperatorInfoParam.setUserId(paramData.getUserId());