diff --git a/src/main/resources/mapper/pms/ProofingInformationMapper.xml b/src/main/resources/mapper/pms/ProofingInformationMapper.xml index 3ab2e9ec..3269f5e9 100644 --- a/src/main/resources/mapper/pms/ProofingInformationMapper.xml +++ b/src/main/resources/mapper/pms/ProofingInformationMapper.xml @@ -273,14 +273,14 @@ status != '草稿' AND RelatedPerson = #{userId} AND ( - project_no = #{query.projectNo} + project_no like '%' + #{query.projectNo} + '%' OR project_no IN ( SELECT Value FROM CKT_MES_II_REAL.dbo.SplitString(#{query.projectNo}, ',') ) ) - and project_desc like #{query.projectDesc} + and project_desc like '%' + #{query.projectDesc} + '%' @@ -303,20 +303,23 @@ AND ( - test_part_no = #{query.testPartNo} + test_part_no like '%' + #{query.testPartNo} + '%' OR test_part_no IN ( SELECT Value FROM CKT_MES_II_REAL.dbo.SplitString(#{query.testPartNo}, ',') ) ) - and part_desc like #{query.partDesc} + and part_desc like '%' + #{query.partDesc} + '%' + + + and proofing_no like '%' + #{query.proofingNo} + '%' - and customer_no = like #{query.customerNo} + and customer_no like '%' + #{query.customerNo} + '%' - and customer_desc = like #{query.customerDesc} + and customer_desc like '%' + #{query.customerDesc} + '%' AND dbo.get_bu_desc ( site, bu_no ) = #{query.buDesc} @@ -376,7 +379,7 @@ AND documentDefinitionListId = #{query.documentDefinitionListId} - AND document_type_id = #{query.documentTypeId} + AND document_type_id like '%' + #{query.documentTypeId} + '%' AND document_type like '%' + #{query.documentType} + '%' @@ -394,7 +397,7 @@ @@ -428,7 +431,7 @@ + + + @@ -530,7 +538,7 @@ @@ -548,7 +556,7 @@ status != '草稿' AND ( - project_no like #{query.projectNo} + project_no like '%' + #{query.projectNo} + '%' OR project_no IN ( SELECT Value FROM CKT_MES_II_REAL.dbo.SplitString(#{query.projectNo}, ',') ) @@ -568,29 +576,29 @@ - and project_desc like #{query.projectDesc} + and project_desc like '%' + #{query.projectDesc} + '%' AND ( - test_part_no like #{query.testPartNo} + test_part_no like '%' + #{query.testPartNo} + '%' OR test_part_no IN ( SELECT Value FROM CKT_MES_II_REAL.dbo.SplitString(#{query.testPartNo}, ',') ) ) - and part_desc like #{query.partDesc} + and part_desc like '%' + #{query.partDesc} + '%' - and customer_no like #{query.customerNo} + and customer_no like '%' + #{query.customerNo} + '%' - and customer_desc like #{query.customerDesc} + and customer_desc like '%' + #{query.customerDesc} + '%' AND dbo.get_bu_desc ( site, bu_no ) = #{query.buDesc} @@ -647,7 +655,7 @@ AND #{query.endDate} >= build_date - AND document_type_id = #{query.documentTypeId} + AND document_type_id like '%' + #{query.documentTypeId} + '%' AND document_type like '%' + #{query.documentType} + '%' @@ -697,34 +705,34 @@ status != '草稿' AND RelatedPerson = #{userId} AND ( - project_no like #{query.projectNo} + project_no like '%' + #{query.projectNo} + '%' OR project_no IN ( SELECT Value FROM CKT_MES_II_REAL.dbo.SplitString(#{query.projectNo}, ',') ) ) - and project_desc like #{query.projectDesc} + and project_desc like '%' + #{query.projectDesc} + '%' and confirm_flag like #{query.confirmFlag} AND ( - test_part_no like #{query.testPartNo} + test_part_no like '%' + #{query.testPartNo} + '%' OR test_part_no IN ( SELECT Value FROM CKT_MES_II_REAL.dbo.SplitString(#{query.testPartNo}, ',') ) ) - and part_desc like #{query.partDesc} + and part_desc like '%' + #{query.partDesc} + '%' - and customer_no like #{query.customerNo} + and customer_no like '%' + #{query.customerNo} + '%' - and customer_desc like #{query.customerDesc} + and customer_desc like '%' + #{query.customerDesc} + '%' AND dbo.get_bu_desc ( site, bu_no ) = #{query.buDesc} @@ -761,7 +769,7 @@ @@ -781,7 +789,7 @@ @@ -844,34 +852,34 @@ status != '草稿' AND ( - project_no like #{query.projectNo} + project_no like '%' + #{query.projectNo} + '%' OR project_no IN ( SELECT Value FROM CKT_MES_II_REAL.dbo.SplitString(#{query.projectNo}, ',') ) ) - and project_desc like #{query.projectDesc} + and project_desc like '%' + #{query.projectDesc} + '%' and confirm_flag = #{query.confirmFlag} AND ( - test_part_no like #{query.testPartNo} + test_part_no like '%' + #{query.testPartNo} + '%' OR test_part_no IN ( SELECT Value FROM CKT_MES_II_REAL.dbo.SplitString(#{query.testPartNo}, ',') ) ) - and part_desc like #{query.partDesc} + and part_desc like '%' + #{query.partDesc} + '%' - and customer_no like #{query.customerNo} + and customer_no like '%' + #{query.customerNo} + '%' - and customer_desc like #{query.customerDesc} + and customer_desc like '%' + #{query.customerDesc} + '%' AND dbo.get_bu_desc ( site, bu_no ) = #{query.buDesc} @@ -1053,28 +1061,28 @@ ppp.status != '草稿' AND ( - b.project_no = #{query.projectNo} + b.project_no like '%' + #{query.projectNo} + '%' OR b.project_no IN ( SELECT Value FROM CKT_MES_II_REAL.dbo.SplitString(#{query.projectNo}, ',') ) ) - and b.project_desc like #{query.projectDesc} + and b.project_desc like '%' + #{query.projectDesc} + '%' AND ( - ppp.test_part_no = #{query.testPartNo} + ppp.test_part_no like '%' + #{query.testPartNo} + '%' OR ppp.test_part_no IN ( SELECT Value FROM CKT_MES_II_REAL.dbo.SplitString(#{query.testPartNo}, ',') ) ) - and ppp.part_desc like #{query.partDesc} + and ppp.part_desc like '%' + #{query.partDesc} + '%' - and ppi.proofing_no = #{query.proofingNo} + and ppi.proofing_no like '%' + #{query.proofingNo} + '%' and ppp.project_manager = #{query.projectManager} @@ -1086,10 +1094,10 @@ and ppp.engineer = #{query.engineer} - and b.customer_no like #{query.customerNo} + and b.customer_no like '%' + #{query.customerNo} + '%' - and dbo.plm_get_customer_desc(b.site,b.customer_no) like #{query.customerDesc} + and dbo.plm_get_customer_desc(b.site,b.customer_no) like '%' + #{query.customerDesc} + '%' AND dbo.get_bu_desc ( b.site,b.bu_no ) = #{query.buDesc}