From 2c5e5632854e527f1ab38f062270f13ae13fbe7e Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 15 Sep 2025 13:54:52 +0800
Subject: [PATCH] =?UTF-8?q?2025-09-15=20=E5=88=80=E6=A8=A1=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=8A=8A=E7=94=B3=E8=AF=B7=E6=97=A5=E6=9C=9F=E6=8D=A2=E6=88=90?=
 =?UTF-8?q?=E5=88=80=E5=8F=B7=E5=92=8C=E6=96=99=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/PlmProjectToolApplyHeaderData.java   |  4 +-
 .../Tooling/ProjectToolingApplyMapper.xml     | 51 ++++++++++++++++---
 2 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/spring/modules/Tooling/data/PlmProjectToolApplyHeaderData.java b/src/main/java/com/spring/modules/Tooling/data/PlmProjectToolApplyHeaderData.java
index fe221098..93eecb15 100644
--- a/src/main/java/com/spring/modules/Tooling/data/PlmProjectToolApplyHeaderData.java
+++ b/src/main/java/com/spring/modules/Tooling/data/PlmProjectToolApplyHeaderData.java
@@ -36,5 +36,7 @@ public class PlmProjectToolApplyHeaderData extends PlmProjectToolApplyHeader {
     private String nodeName;
     private String sp;
     private String csName;
-
+    private String toolId;
+    private String ifsPartNo;
+    private String plmPartNo;
 }
diff --git a/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml b/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml
index eb065930..db804972 100644
--- a/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml
+++ b/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml
@@ -300,12 +300,12 @@
             <if test="query.status != null and query.status != ''">
                 AND a.status like #{query.status}
             </if>
-            <if test="query.startDate != null ">
-                AND a.apply_date >= #{query.startDate}
-            </if>
-             <if test="query.endDate != null ">
-                AND  #{query.endDate} >= a.apply_date
-            </if>
+<!--            <if test="query.startDate != null ">-->
+<!--                AND a.apply_date >= #{query.startDate}-->
+<!--            </if>-->
+<!--             <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>
@@ -319,6 +319,45 @@
             <!--                AND project_id in ( select project_id from AccessProject where site=#{query.site} and username=#{query.userName} and searchFlag='Y' )-->
             <!--                AND bu_no in ( select bu_no from AccessBu where site=#{query.site} and username=#{query.userName})-->
             <!--            </if>-->
+
+            <!-- 新增：通过 EXISTS 关联明细表，按 tool_id 筛选 -->
+            <if test="query.toolId != null and query.toolId != ''">
+                AND EXISTS (
+                SELECT 1
+                FROM plm_project_tool_applyDetail b
+                WHERE b.site = a.site
+                AND b.apply_no = a.apply_no
+                AND b.tool_id like #{query.toolId}
+                )
+            </if>
+            <!-- 新增：通过 EXISTS 关联明细 + view_Project_Part，按 final_part_no 过滤 -->
+            <if test="query.ifsPartNo != null and query.ifsPartNo != ''">
+                AND EXISTS (
+                SELECT 1
+                FROM plm_project_tool_applyDetail det
+                LEFT JOIN view_Project_Part h
+                ON det.site = h.site
+                AND h.test_part_no = det.orderRef2
+                AND det.orderRef1 = h.project_id
+                WHERE det.site = a.site
+                AND det.apply_no = a.apply_no
+                AND h.final_part_no like #{query.ifsPartNo}
+                )
+            </if>
+            <!-- 新增：通过 EXISTS 关联明细 + view_Project_Part，按 plm_part_no 过滤 -->
+            <if test="query.plmPartNo != null and query.plmPartNo != ''">
+                AND EXISTS (
+                SELECT 1
+                FROM plm_project_tool_applyDetail det
+                LEFT JOIN view_Project_Part h
+                ON det.site = h.site
+                AND h.test_part_no = det.orderRef2
+                AND det.orderRef1 = h.project_id
+                WHERE det.site = a.site
+                AND det.apply_no = a.apply_no
+                AND h.plm_part_no like #{query.plmPartNo}
+                )
+            </if>
         </where>
         order by a.apply_no desc
     </select>