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 @@
AND a.status like #{query.status}
-
- AND a.apply_date >= #{query.startDate}
-
-
- AND #{query.endDate} >= a.apply_date
-
+
+
+
+
+
+
AND d.node_id = #{query.nodeId}
@@ -319,6 +319,45 @@
+
+
+
+ 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}
+ )
+
+
+
+ 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}
+ )
+
+
+
+ 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}
+ )
+
order by a.apply_no desc