From 69e6e33d9d4db8c3f07aab7a45e47b4afa1e2ecf Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 11 Jun 2025 16:06:18 +0800
Subject: [PATCH] 2025-06-11

---
 .../impl/RequestManageServiceImpl.java        | 51 ++++++++++---------
 .../TechnicalSpecificationMapper.xml          | 13 ++---
 2 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java b/src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java
index cfa13dce..78e5d7fe 100644
--- a/src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java
+++ b/src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java
@@ -388,7 +388,8 @@ public class RequestManageServiceImpl extends ServiceImpl<RequestManageMapper, P
 //            } catch (NumberFormatException e) {
 //                throw new RuntimeException("节点ID不能转为整数: " + inData.getNodeId(), e);
 //            }
-            List<ProcessFormVo> previousProcessList = requestManageMapper.getThePreviousProcessInfo(inData.getSite(), inData.getBu(), inData.getDocumentNo(), inData.getStepId());
+            // 2025-06-11 流程干预获取上一个节点作为提交节点 所以-10
+            List<ProcessFormVo> previousProcessList = requestManageMapper.getThePreviousProcessInfo(inData.getSite(), inData.getBu(), inData.getDocumentNo(), inData.getStepId() - 10);
             if (previousProcessList.isEmpty()) {
                 throw new RuntimeException("不存在上一个节点的流程流转信息!");
             }
@@ -438,28 +439,32 @@ public class RequestManageServiceImpl extends ServiceImpl<RequestManageMapper, P
             for (ProcessFormVo processFormVo : previousProcessList) {
                 requestManageMapper.updateIsRemarkToZero(processFormVo.getId());
             }
-            ChangeRequestVo vo = new ChangeRequestVo();
-            vo.setSite(inData.getSite());
-            vo.setBu(inData.getBu());
-            vo.setUserName(data.getUserId());
-            vo.setDocumentNo(inData.getDocumentNo());
-            vo.setNodeConclusion("同意");
-            vo.setRejectOpinion("");
-            vo.setNodeId(previousProcessList.get(0).getNodeId());
-            vo.setProcessFlag(data.getProcessFlag());
-            vo.setRevisionNo(inData.getRevisionNo());
-            if (Constant.ECN.equals(inData.getDocumentType())) {
-                changeManagementService.submitChangeToFlow(vo);
-            } else if (Constant.DY_PR.equals(inData.getDocumentType())) {
-                proofingInformationService.submitProofingToFlow(vo);
-            } else if (Constant.TEST.equals(inData.getDocumentType())) {
-                testInformationService.submitTestToFlow(vo);
-            } else if (Constant.TOOL.equals(inData.getDocumentType())) {
-                projectToolingApplyService.submitToolToFlow(vo);
-            } else if (Constant.QUOTATION.equals(inData.getDocumentType())) {
-                quotationInformationService.submitQuotationToFlow(vo);
-            } else if (Constant.BM.equals(inData.getDocumentType())) {
-                technicalSpecificationService.submitQuotationToFlow(vo);
+
+            // 2025-06-11 如果是节点更新才走提交 流程干预不走提交：流程干预只需要退回到上一节点，不需要再提交
+            if ("update".equals(data.getProcessFlag())) {
+                ChangeRequestVo vo = new ChangeRequestVo();
+                vo.setSite(inData.getSite());
+                vo.setBu(inData.getBu());
+                vo.setUserName(data.getUserId());
+                vo.setDocumentNo(inData.getDocumentNo());
+                vo.setNodeConclusion("同意");
+                vo.setRejectOpinion("");
+                vo.setNodeId(previousProcessList.get(0).getNodeId());
+                vo.setProcessFlag(data.getProcessFlag());
+                vo.setRevisionNo(inData.getRevisionNo());
+                if (Constant.ECN.equals(inData.getDocumentType())) {
+                    changeManagementService.submitChangeToFlow(vo);
+                } else if (Constant.DY_PR.equals(inData.getDocumentType())) {
+                    proofingInformationService.submitProofingToFlow(vo);
+                } else if (Constant.TEST.equals(inData.getDocumentType())) {
+                    testInformationService.submitTestToFlow(vo);
+                } else if (Constant.TOOL.equals(inData.getDocumentType())) {
+                    projectToolingApplyService.submitToolToFlow(vo);
+                } else if (Constant.QUOTATION.equals(inData.getDocumentType())) {
+                    quotationInformationService.submitQuotationToFlow(vo);
+                } else if (Constant.BM.equals(inData.getDocumentType())) {
+                    technicalSpecificationService.submitQuotationToFlow(vo);
+                }
             }
         }
     }
diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
index 1a5485ed..1ecb7326 100644
--- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
+++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
@@ -2467,14 +2467,11 @@
         a.document_source                                                            as documentSource,
         a.url_file
         FROM plm_technical_specification_sheet a
-            left join view_Project_final_Part b
-                      on a.site = b.site and a.project_id = b.project_id and a.test_part_no = b.test_part_no
-            left join plm_project_info c on a.site = c.site and a.project_id = c.project_id
-            left join plm_request_header as prh on a.site = prh.site and prh.menu_id = '103002'
-            left join plm_request_node as d on a.site = d.site and prh.classification_no = d.classification_no and
-                                               prh.workflow_id = d.workflow_id and a.step_id = d.step_id
-            left join plm_customer_part_info pcpi
-                      on a.site = pcpi.site and a.test_part_no = pcpi.part_no and c.customer_id = pcpi.customer_no
+        left join view_Project_final_Part b on a.site = b.site and a.project_id = b.project_id and a.test_part_no = b.test_part_no
+        left join plm_project_info c on a.site = c.site and a.project_id = c.project_id
+        left join plm_request_header as prh on a.site = prh.site and prh.menu_id = '103002'
+        left join plm_request_node as d on a.site = d.site and prh.classification_no = d.classification_no and prh.workflow_id = d.workflow_id and a.step_id = d.step_id
+        left join plm_customer_part_info pcpi on a.site = pcpi.site and a.test_part_no = pcpi.part_no and c.customer_id = pcpi.customer_no
         <if test="cutterNumber != null and cutterNumber != ''">
             inner join plm_bm_prepress pbp on pbp.Site = a.site and pbp.code_no = a.code_no and
                                               (plateNo like #{cutterNumber} or