From de955809abaa2f2cfd69bdb7c20fe217e02e75c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com>
Date: Wed, 31 Dec 2025 11:41:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=89=A9=E6=96=99=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=9A=E5=A2=9E=E5=8A=A0=20'=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=E6=89=93=E6=96=99=E8=AE=B0=E5=BD=95'?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/modules/pms/data/EamProjectPartInfoData.java |  3 +++
 src/main/resources/mapper/pms/EamProjectMapper.xml   | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/src/main/java/com/xujie/sys/modules/pms/data/EamProjectPartInfoData.java b/src/main/java/com/xujie/sys/modules/pms/data/EamProjectPartInfoData.java
index ff71355c..04f9b216 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/EamProjectPartInfoData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/EamProjectPartInfoData.java
@@ -153,6 +153,9 @@ public class EamProjectPartInfoData extends EamProjectInfoData{
     @TableField(exist = false)
     private String partNo;
 
+    @TableField(exist = false)
+    private String feedingFlag;
+
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(exist = false)
diff --git a/src/main/resources/mapper/pms/EamProjectMapper.xml b/src/main/resources/mapper/pms/EamProjectMapper.xml
index 86a185d3..3fd889db 100644
--- a/src/main/resources/mapper/pms/EamProjectMapper.xml
+++ b/src/main/resources/mapper/pms/EamProjectMapper.xml
@@ -430,6 +430,18 @@
                 )
                 )
             </if>
+            <if test="query.feedingFlag != null and query.feedingFlag == 1 ">
+                and (
+                select count(*) from plm_proofing_information ppi
+                where ppi.project_id = a.project_id and ppi.test_part_id = a.id
+                ) > 0
+            </if>
+            <if test="query.feedingFlag != null and query.feedingFlag == 2 ">
+                and (
+                select count(*) from plm_proofing_information ppi
+                where ppi.project_id = a.project_id and ppi.test_part_id = a.id
+                ) = 0
+            </if>
             <if test="query.projectNo != null and query.projectNo != ''">
                 AND
                 (b.project_no = #{query.projectNo} OR b.project_no IN (SELECT Value FROM CKT_MES_II_REAL.dbo.SplitString(#{query.projectNo}, ',')))