From 2593d2062618318f6ce62930ae875931d847ec0a Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Tue, 28 Jul 2026 14:57:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E9=94=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/ProofTrackingData.java               |  4 ++++
 .../SampleProofTrackingMapper.xml             | 23 +++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/src/main/java/com/xujie/sys/modules/sampletracking/data/ProofTrackingData.java b/src/main/java/com/xujie/sys/modules/sampletracking/data/ProofTrackingData.java
index 27e5a6f2..5cc55592 100644
--- a/src/main/java/com/xujie/sys/modules/sampletracking/data/ProofTrackingData.java
+++ b/src/main/java/com/xujie/sys/modules/sampletracking/data/ProofTrackingData.java
@@ -128,6 +128,10 @@ public class ProofTrackingData extends QueryPage {
 
     private String proofingNo;
     private String proofingStatus;
+    @TableField(exist = false)
+    private String projectPartSyncFlag;
+    @TableField(exist = false)
+    private String proofSyncFlag;
     private String projectPhase;
     private String projectCategory;
     private String tracker;
diff --git a/src/main/resources/mapper/sampletracking/SampleProofTrackingMapper.xml b/src/main/resources/mapper/sampletracking/SampleProofTrackingMapper.xml
index 9670ac6d..cf7f92ed 100644
--- a/src/main/resources/mapper/sampletracking/SampleProofTrackingMapper.xml
+++ b/src/main/resources/mapper/sampletracking/SampleProofTrackingMapper.xml
@@ -126,6 +126,29 @@
             <if test="query.proofingStatus != null and query.proofingStatus != ''">
                 and t.proofing_status = #{query.proofingStatus}
             </if>
+            <if test="query.projectPartSyncFlag != null and query.projectPartSyncFlag != ''">
+                <!-- 同步判定规则：ID < 100000 视为已对齐到 NPI 正式数据。 -->
+                <choose>
+                    <when test='query.projectPartSyncFlag == "Y"'>
+                        and t.project_part_id is not null
+                        and t.project_part_id &lt; 100000
+                    </when>
+                    <otherwise>
+                        and t.project_part_id &gt;= 100000
+                    </otherwise>
+                </choose>
+            </if>
+            <if test="query.proofSyncFlag != null and query.proofSyncFlag != ''">
+                <!-- 打样同步优先按 proofing_id 判定；为空时回退 tracking id 保持与前端显示一致。 -->
+                <choose>
+                    <when test='query.proofSyncFlag == "Y"'>
+                        and ISNULL(t.proofing_id, t.id) &lt; 100000
+                    </when>
+                    <otherwise>
+                        and ISNULL(t.proofing_id, t.id) &gt;= 100000
+                    </otherwise>
+                </choose>
+            </if>
             <if test="query.projectCategory != null and query.projectCategory != ''">
                 and p.project_category = #{query.projectCategory}
             </if>