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 @@ and t.proofing_status = #{query.proofingStatus} + + + + + and t.project_part_id is not null + and t.project_part_id < 100000 + + + and t.project_part_id >= 100000 + + + + + + + + and ISNULL(t.proofing_id, t.id) < 100000 + + + and ISNULL(t.proofing_id, t.id) >= 100000 + + + and p.project_category = #{query.projectCategory}