From 850a13ec9490198c221d1c9b1d552e67028e37bd Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 10 Oct 2024 17:32:17 +0800
Subject: [PATCH] =?UTF-8?q?2024-10-10=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectToolingApplyServiceImpl.java     | 4 ++--
 .../change/service/impl/ChangeManagementServiceImpl.java | 9 +++++----
 .../service/impl/ProofingInformationServiceImpl.java     | 4 ++--
 .../service/impl/QuotationInformationServiceImpl.java    | 4 ++--
 .../service/Impl/TechnicalSpecificationServiceImpl.java  | 4 ++--
 .../test/service/impl/TestInformationServiceImpl.java    | 4 ++--
 6 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/spring/modules/Tooling/service/impl/ProjectToolingApplyServiceImpl.java b/src/main/java/com/spring/modules/Tooling/service/impl/ProjectToolingApplyServiceImpl.java
index 401a7610..72efa190 100644
--- a/src/main/java/com/spring/modules/Tooling/service/impl/ProjectToolingApplyServiceImpl.java
+++ b/src/main/java/com/spring/modules/Tooling/service/impl/ProjectToolingApplyServiceImpl.java
@@ -224,7 +224,7 @@ public class ProjectToolingApplyServiceImpl implements ProjectToolingApplyServic
             mainData.add(md);
         }
 
-        ParamData paramData = new ParamData(data.getSite(), baseData.get("controlAccount"), nodeDetails.get(0).getNodeId(),
+        ParamData paramData = new ParamData(data.getSite(), baseData.get("domainControlAccount"), nodeDetails.get(0).getNodeId(),
                 data.getApplyNo(), data.getUserName(), baseData.get("classificationNo"),
                 nodeDetails.get(0).getStepId(), baseData.get("menuId"), baseData.get("userId"), baseData.get("workflowId"),
                 baseData.get("workflowname"), baseData.get("requestName"), mainData, baseData.get("path"), "", "plm_project_tool_applyHeader", "apply_no");
@@ -234,7 +234,7 @@ public class ProjectToolingApplyServiceImpl implements ProjectToolingApplyServic
             data.setStatusCode("15");
             data.setStatus("审批中");
         } catch (Exception e) {
-            changeManagementService.rollBackFunction(paramData);
+            changeManagementService.rollBackFunction(paramData, e);
             throw new RuntimeException(e.getMessage());
         }
 
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 db38fef6..c4bc38f9 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
@@ -1054,7 +1054,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
             // 10、修改变更单的状态为 "审批中"
             data.setChangeStatus("审批中");
         } catch (Exception e) {
-            rollBackFunction(paramData);
+            rollBackFunction(paramData, e);
             throw new RuntimeException(e.getMessage());
         }
         changeManagementMapper.updateChangeStatus(data);
@@ -1226,7 +1226,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
     /**
      * 回滚方法
      */
-    public void rollBackFunction(ParamData paramData) {
+    public void rollBackFunction(ParamData paramData, Exception e) {
         // 撤回接口
         DoForceDrawBackParam doForceDrawBackParam = new DoForceDrawBackParam();
         doForceDrawBackParam.setUserId(paramData.getUserId());
@@ -1234,7 +1234,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
         String doForceDrawBackURL = apiUrlOa + "/oa/interface/doForceDrawBack";
         ResponseData doForceDrawBackResponses = HttpClientUtil.doPostByRawWithOA(doForceDrawBackURL, doForceDrawBackParam);
         if (!"0".equals(doForceDrawBackResponses.getCode())) {
-            throw new RuntimeException("OA撤回流程异常信息：" + doForceDrawBackResponses.getMsg());
+            throw new RuntimeException(e.getMessage() + "; OA撤回流程异常信息：" + doForceDrawBackResponses.getMsg());
         }
         // 调用删除流程接口
         RequestOperatorInfoParam requestOperatorInfoParam = new RequestOperatorInfoParam();
@@ -1243,8 +1243,9 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
         String deleteRequestURL = apiUrlOa + "/oa/interface/deleteRequest";
         ResponseData deleteRequestResponses = HttpClientUtil.doPostByRawWithOA(deleteRequestURL, requestOperatorInfoParam);
         if (!"0".equals(deleteRequestResponses.getCode())) {
-            throw new RuntimeException("OA删除流程异常信息：" + deleteRequestResponses.getMsg());
+            throw new RuntimeException(e.getMessage() + "; OA删除流程异常信息：" + deleteRequestResponses.getMsg());
         }
+        throw new RuntimeException(e.getMessage());
     }
 
 
diff --git a/src/main/java/com/spring/modules/proofing/service/impl/ProofingInformationServiceImpl.java b/src/main/java/com/spring/modules/proofing/service/impl/ProofingInformationServiceImpl.java
index e0ddd238..b5ea9949 100644
--- a/src/main/java/com/spring/modules/proofing/service/impl/ProofingInformationServiceImpl.java
+++ b/src/main/java/com/spring/modules/proofing/service/impl/ProofingInformationServiceImpl.java
@@ -503,7 +503,7 @@ public class ProofingInformationServiceImpl extends ServiceImpl<ProofingInformat
             }
         }
 
-        ParamData paramData = new ParamData(data.getSite(), baseData.get("controlAccount"), nodeDetails.get(0).getNodeId(),
+        ParamData paramData = new ParamData(data.getSite(), baseData.get("domainControlAccount"), nodeDetails.get(0).getNodeId(),
                 data.getProofingNo(), data.getUserName(), baseData.get("classificationNo"),
                 nodeDetails.get(0).getStepId(), baseData.get("menuId"), baseData.get("userId"), baseData.get("workflowId"),
                 baseData.get("workflowname"), baseData.get("requestName"), mainData, baseData.get("path"), "", "plm_proofing_information", "proofing_no");
@@ -514,7 +514,7 @@ public class ProofingInformationServiceImpl extends ServiceImpl<ProofingInformat
             data.setStepId(paramData.getStepId());
             data.setProofingStatus("审批中");
         } catch (Exception e) {
-            changeManagementService.rollBackFunction(paramData);
+            changeManagementService.rollBackFunction(paramData, e);
             throw new RuntimeException(e.getMessage());
         }
 
diff --git a/src/main/java/com/spring/modules/quotation/service/impl/QuotationInformationServiceImpl.java b/src/main/java/com/spring/modules/quotation/service/impl/QuotationInformationServiceImpl.java
index 42239178..a1dc2d41 100644
--- a/src/main/java/com/spring/modules/quotation/service/impl/QuotationInformationServiceImpl.java
+++ b/src/main/java/com/spring/modules/quotation/service/impl/QuotationInformationServiceImpl.java
@@ -650,7 +650,7 @@ public class QuotationInformationServiceImpl extends ServiceImpl<QuotationInform
             }
             mainData.add(md);
         }
-        ParamData paramData = new ParamData(data.getSite(), baseData.get("controlAccount"), nodeDetails.get(0).getNodeId(),
+        ParamData paramData = new ParamData(data.getSite(), baseData.get("domainControlAccount"), nodeDetails.get(0).getNodeId(),
                 data.getQuotationNo(), data.getUserName(), baseData.get("classificationNo"),
                 nodeDetails.get(0).getStepId(), baseData.get("menuId"), baseData.get("userId"), baseData.get("workflowId"),
                 baseData.get("workflowname"), baseData.get("requestName"), mainData, baseData.get("path"), "", "plm_quotation_information", "quotation_no");
@@ -660,7 +660,7 @@ public class QuotationInformationServiceImpl extends ServiceImpl<QuotationInform
             data.setStepId(paramData.getStepId());
             data.setQuotationStatus("审批中");
         } catch (Exception e) {
-            changeManagementService.rollBackFunction(paramData);
+            changeManagementService.rollBackFunction(paramData, e);
             throw new RuntimeException(e.getMessage());
         }
 
diff --git a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java
index 098e1bd6..5ce9da32 100644
--- a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java
+++ b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java
@@ -1169,7 +1169,7 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
             mainData.add(md);
         }
 
-        ParamData paramData = new ParamData(data.getSite(), baseData.get("controlAccount"), nodeDetails.get(0).getNodeId(),
+        ParamData paramData = new ParamData(data.getSite(), baseData.get("domainControlAccount"), nodeDetails.get(0).getNodeId(),
                 data.getCodeNo(), data.getUserName(), baseData.get("classificationNo"),
                 nodeDetails.get(0).getStepId(), baseData.get("menuId"), baseData.get("userId"), baseData.get("workflowId"),
                 baseData.get("workflowname"), baseData.get("requestName"), mainData, baseData.get("path"), "", "plm_technical_specification_sheet", "code_no");
@@ -1179,7 +1179,7 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
             data.setStatus("spz");
             technicalSpecificationMapper.updateStatus(data);
         } catch (Exception e) {
-            changeManagementService.rollBackFunction(paramData);
+            changeManagementService.rollBackFunction(paramData, e);
             throw new RuntimeException(e.getMessage());
         }
 
diff --git a/src/main/java/com/spring/modules/test/service/impl/TestInformationServiceImpl.java b/src/main/java/com/spring/modules/test/service/impl/TestInformationServiceImpl.java
index 0c655651..a68f9b9a 100644
--- a/src/main/java/com/spring/modules/test/service/impl/TestInformationServiceImpl.java
+++ b/src/main/java/com/spring/modules/test/service/impl/TestInformationServiceImpl.java
@@ -235,7 +235,7 @@ public class TestInformationServiceImpl extends ServiceImpl<TestInformationMappe
             }
             mainData.add(md);
         }
-        ParamData paramData = new ParamData(data.getSite(), baseData.get("controlAccount"), nodeDetails.get(0).getNodeId(),
+        ParamData paramData = new ParamData(data.getSite(), baseData.get("domainControlAccount"), nodeDetails.get(0).getNodeId(),
                 data.getTestNo(), data.getUserName(), baseData.get("classificationNo"),
                 nodeDetails.get(0).getStepId(), baseData.get("menuId"), baseData.get("userId"), baseData.get("workflowId"),
                 baseData.get("workflowname"), baseData.get("requestName"), mainData, baseData.get("path"), "", "plm_test_information", "test_no");
@@ -245,7 +245,7 @@ public class TestInformationServiceImpl extends ServiceImpl<TestInformationMappe
             data.setStepId(paramData.getStepId());
             data.setTestStatus("审批中");
         } catch (Exception e) {
-            changeManagementService.rollBackFunction(paramData);
+            changeManagementService.rollBackFunction(paramData, e);
             throw new RuntimeException(e.getMessage());
         }