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 @@ ) ) + + and ( + select count(*) from plm_proofing_information ppi + where ppi.project_id = a.project_id and ppi.test_part_id = a.id + ) > 0 + + + and ( + select count(*) from plm_proofing_information ppi + where ppi.project_id = a.project_id and ppi.test_part_id = a.id + ) = 0 + AND (b.project_no = #{query.projectNo} OR b.project_no IN (SELECT Value FROM CKT_MES_II_REAL.dbo.SplitString(#{query.projectNo}, ',')))