From 6dc298a22401d87e351ccfd87dbc9b9e0bf55dbd Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 8 Jul 2025 15:08:19 +0800
Subject: [PATCH] =?UTF-8?q?2025-07-08=201=E3=80=81=E6=8A=80=E6=9C=AF?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=8D=A1=E7=9A=84=E5=BD=93=E5=89=8D=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E7=9A=84=E7=AD=9B=E9=80=89=E6=9C=89=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20-=20=E4=BC=98=E5=85=88=E5=A4=84=E7=90=86=202=E3=80=81?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=E4=BC=98=E5=8C=96=EF=BC=88?=
 =?UTF-8?q?=E4=BC=98=E5=85=88=E5=A4=84=E7=90=86=E5=88=80=E5=85=B7=E5=92=8C?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=EF=BC=89=203=E3=80=81=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9C=89=E5=A4=9A=E9=A1=B5=EF=BC=8C=E7=82=B9?=
 =?UTF-8?q?=E4=BA=86=E6=9F=A5=E8=AF=A2=E4=B9=8B=E5=90=8E=E8=A6=81=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E7=AC=AC=E4=B8=80=E9=A1=B5=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/RecipeManagementServiceImpl.java     |  4 ++--
 .../Tooling/ProjectToolingApplyMapper.xml     |  7 ++++++-
 .../mapper/change/ChangeManagementMapper.xml  |  6 ++++++
 .../proofing/ProofingInformationMapper.xml    | 15 ++++++++------
 .../quotation/QuotationInformationMapper.xml  | 15 ++++++++------
 .../TechnicalSpecificationMapper.xml          | 19 ++++++++++--------
 .../mapper/test/TestInformationMapper.xml     | 20 ++++++++++---------
 7 files changed, 54 insertions(+), 32 deletions(-)

diff --git a/src/main/java/com/spring/modules/part/service/impl/RecipeManagementServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/RecipeManagementServiceImpl.java
index f5b777df..0ac4f937 100644
--- a/src/main/java/com/spring/modules/part/service/impl/RecipeManagementServiceImpl.java
+++ b/src/main/java/com/spring/modules/part/service/impl/RecipeManagementServiceImpl.java
@@ -149,7 +149,7 @@ public class RecipeManagementServiceImpl extends ServiceImpl<RecipeManagementMap
                 recipeIfsHeader.setNoteText(data.getNoteText());
                 Map<String, String> updateRecipeHeaderResponse = recipeServiceBean.modifyRecipeHeader(srv, recipeIfsHeader);
                 if (!"200".equals(updateRecipeHeaderResponse.get("resultCode"))) {
-                    throw new RuntimeException("ifs RecipeHeader修改异常：" + updateRecipeHeaderResponse.get("resultMsg"));
+                    throw new RuntimeException("IFS RecipeHeader修改异常：" + updateRecipeHeaderResponse.get("resultMsg"));
                 }
             }
         }
@@ -184,7 +184,7 @@ public class RecipeManagementServiceImpl extends ServiceImpl<RecipeManagementMap
                 recipeIfsHeader.setNoteText(data.getNoteText());
                 Map<String, String> updateRecipeHeaderResponse = recipeServiceBean.modifyRecipeHeader(srv, recipeIfsHeader);
                 if (!"200".equals(updateRecipeHeaderResponse.get("resultCode"))) {
-                    throw new RuntimeException("ifs RecipeHeader修改异常：" + updateRecipeHeaderResponse.get("resultMsg"));
+                    throw new RuntimeException("IFS RecipeHeader修改异常：" + updateRecipeHeaderResponse.get("resultMsg"));
                 }
             }
         }
diff --git a/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml b/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml
index 8fa2cf54..92f5084c 100644
--- a/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml
+++ b/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml
@@ -273,7 +273,12 @@
              <if test="query.endDate != null ">
                 AND  #{query.endDate} >= a.apply_date
             </if>
-
+            <if test="query.nodeId != null and query.nodeId != ''">
+                AND d.node_id = #{query.nodeId}
+            </if>
+            <if test="query.sp != null and query.sp != ''">
+                AND dbo.get_plm_Approval_username (a.site, prh.workflow_id,d.node_id,a.apply_no) like #{query.sp}
+            </if>
             <!--            <if test="query.projectOwnerName != null and query.projectOwnerName != ''">-->
             <!--                AND dbo.get_projectTeamName(site,project_id,'ProjectOwner') like '%' + #{query.projectOwnerName} +'%'-->
             <!--            </if>-->
diff --git a/src/main/resources/mapper/change/ChangeManagementMapper.xml b/src/main/resources/mapper/change/ChangeManagementMapper.xml
index 6ffd9251..fd30c9ca 100644
--- a/src/main/resources/mapper/change/ChangeManagementMapper.xml
+++ b/src/main/resources/mapper/change/ChangeManagementMapper.xml
@@ -229,6 +229,12 @@
             <if test = "query.changeStatus != null and query.changeStatus != ''">
                 AND a.change_status = #{query.changeStatus}
             </if>
+            <if test="query.nodeId != null and query.nodeId != ''">
+                AND d.node_id = #{query.nodeId}
+            </if>
+            <if test="query.createBy2 != null and query.createBy2 != ''">
+                AND dbo.get_plm_Approval_username(a.site, prh.workflow_id, d.node_id, a.change_no) like #{query.createBy2}
+            </if>
         </where>
         order by a.change_no desc
     </select>
diff --git a/src/main/resources/mapper/proofing/ProofingInformationMapper.xml b/src/main/resources/mapper/proofing/ProofingInformationMapper.xml
index c68ae69a..1fc8b7fe 100644
--- a/src/main/resources/mapper/proofing/ProofingInformationMapper.xml
+++ b/src/main/resources/mapper/proofing/ProofingInformationMapper.xml
@@ -63,13 +63,10 @@
                dbo.GET_BM_stage(a.site,a.test_part_no) as stage
         FROM plm_proofing_information as a
                  left join plm_request_header as prh on a.site = prh.site and prh.menu_id = #{query.menuId}
-                 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 view_Project_Part vpp
-                           on vpp.site = a.site and vpp.test_part_no = a.test_part_no and vpp.project_id = a.project_id
+                 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 view_Project_Part vpp on vpp.site = a.site and vpp.test_part_no = a.test_part_no and vpp.project_id = a.project_id
                  left join BU b on vpp.bu_no = b.bu_no and a.site = b.site
-                 left join plm_customer_part_info pcpi
-                           on a.site = pcpi.site and a.test_part_no = pcpi.part_no and a.customer_no = pcpi.customer_no
+                 left join plm_customer_part_info pcpi on a.site = pcpi.site and a.test_part_no = pcpi.part_no and a.customer_no = pcpi.customer_no
         <where>
             a.site = #{query.site}
             <if test="query.createBy != null and query.createBy != ''">
@@ -129,6 +126,12 @@
             <if test="query.customerPartNo != null and query.customerPartNo != ''">
                 AND pcpi.customer_part_no like #{query.customerPartNo}
             </if>
+            <if test="query.nodeId != null and query.nodeId != ''">
+                AND d.node_id = #{query.nodeId}
+            </if>
+            <if test="query.approvalUsername != null and query.approvalUsername != ''">
+                AND dbo.get_plm_Approval_username(a.site, d.workflow_id, d.node_id, a.proofing_no) like #{query.approvalUsername}
+            </if>
         </where>
         order by a.proofing_no desc
     </select>
diff --git a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml
index 9e37e31b..e3f2b051 100644
--- a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml
+++ b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml
@@ -131,14 +131,11 @@
         FROM plm_quotation_information as a
         <if test="query.menuId != null and query.menuId != ''">
             left join plm_request_header as prh on a.site = prh.site and prh.menu_id = #{query.menuId}
-            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_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
         </if>
-        left join view_Project_Part vpp
-                  on vpp.site = a.site and vpp.test_part_no = a.test_part_no and vpp.project_id = a.project_id
+        left join view_Project_Part vpp on vpp.site = a.site and vpp.test_part_no = a.test_part_no and vpp.project_id = a.project_id
         left join BU b on vpp.bu_no = b.bu_no and a.site = b.site
-        left join plm_customer_part_info pcpi
-                  on a.site = pcpi.site and a.test_part_no = pcpi.part_no and a.customer_no = pcpi.customer_no
+        left join plm_customer_part_info pcpi on a.site = pcpi.site and a.test_part_no = pcpi.part_no and a.customer_no = pcpi.customer_no
         <where>
             a.site = #{query.site}
             <if test="query.createBy != null and query.createBy != ''">
@@ -201,6 +198,12 @@
             <if test="query.customerPartNo != null and query.customerPartNo != ''">
                 and pcpi.customer_part_no like #{query.customerPartNo}
             </if>
+            <if test="query.nodeId != null and query.nodeId != ''">
+                AND d.node_id = #{query.nodeId}
+            </if>
+            <if test="query.approvalUsername != null and query.approvalUsername != ''">
+                AND dbo.get_plm_Approval_username(a.site, d.workflow_id, d.node_id, a.quotation_batch_no) like #{query.approvalUsername}
+            </if>
             order by a.quotation_batch_no desc, a.quotation_item_no
         </where>
     </select>
diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
index bb9065b7..13e80c5e 100644
--- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
+++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
@@ -2532,7 +2532,7 @@
                 AND b.bu_no like #{buNo}
             </if>
             <if test="nodeId != null and nodeId != ''">
-                AND d.node_id like #{nodeId}
+                AND d.node_id = #{nodeId}
             </if>
             <if test="sp != null and sp != ''">
                 AND dbo.get_plm_Approval_username(a.site, prh.workflow_id, d.node_id, a.code_no) like #{sp}
@@ -2547,14 +2547,11 @@
     <select id="queryTechnicalSpecificationCount" resultType="long">
         SELECT count(1)
         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 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 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
@@ -2605,6 +2602,12 @@
             <if test="buNo != null and buNo != ''">
                 AND b.bu_no like #{buNo}
             </if>
+            <if test="nodeId != null and nodeId != ''">
+                AND d.node_id = #{nodeId}
+            </if>
+            <if test="sp != null and sp != ''">
+                AND dbo.get_plm_Approval_username(a.site, prh.workflow_id, d.node_id, a.code_no) like #{sp}
+            </if>
             <if test="documentSource != null and documentSource != ''">
                 AND a.document_source = #{documentSource}
             </if>
@@ -2762,7 +2765,7 @@
         FROM
             plm_request_header AS prh
                 LEFT JOIN plm_request_node AS d ON prh.site = d.site and  prh.classification_no = d.classification_no
-                AND prh.workflow_id = d.workflow_id AND prh.menu_id = '103002'
+                AND prh.workflow_id = d.workflow_id AND prh.menu_id = #{menuId}
         WHERE
             d.site = #{site}
         order by seq_no
diff --git a/src/main/resources/mapper/test/TestInformationMapper.xml b/src/main/resources/mapper/test/TestInformationMapper.xml
index 346364ba..b6eae3c2 100644
--- a/src/main/resources/mapper/test/TestInformationMapper.xml
+++ b/src/main/resources/mapper/test/TestInformationMapper.xml
@@ -63,17 +63,13 @@
                cp.customer_part_no,
                dbo.get_plm_Approval_username(a.site, d.workflow_id, d.node_id, a.test_no) as approvalUsername
         FROM plm_test_information as a
-                 left join plm_request_header as prh on a.site = prh.site and prh.menu_id = #{query.menuId}
-                 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 view_Project_Part vpp
-                           on vpp.site = a.site and vpp.test_part_no = a.test_part_no and vpp.project_id = a.project_id
-                 left join BU b on vpp.bu_no = b.bu_no and a.site = b.site
-                 left join plm_customer_part_info cp
-                           on a.site = cp.site and a.customer_no = cp.customer_no and a.test_part_no = cp.part_no
+        left join plm_request_header as prh on a.site = prh.site and prh.menu_id = #{query.menuId}
+        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 view_Project_Part vpp on vpp.site = a.site and vpp.test_part_no = a.test_part_no and vpp.project_id = a.project_id
+        left join BU b on vpp.bu_no = b.bu_no and a.site = b.site
+        left join plm_customer_part_info cp on a.site = cp.site and a.customer_no = cp.customer_no and a.test_part_no = cp.part_no
         <where>
             a.site = #{query.site}
-
             <if test="query.createBy != null and query.createBy != ''">
                 and vpp.bu_no in (select bu_No from dbo.Get_Now_BU_chooseAble(a.site, #{query.createBy}))
             </if>
@@ -128,6 +124,12 @@
             <if test="query.customerPartNo != null and query.customerPartNo != ''">
                 and cp.customer_part_no like #{query.customerPartNo}
             </if>
+            <if test="query.nodeId != null and query.nodeId != ''">
+                AND d.node_id = #{query.nodeId}
+            </if>
+            <if test="query.approvalUsername != null and query.approvalUsername != ''">
+                AND dbo.get_plm_Approval_username(a.site, d.workflow_id, d.node_id, a.test_no) like #{query.approvalUsername}
+            </if>
         </where>
         order by a.test_no desc
     </select>