diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml index 694e5e6..1e173ea 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -101,7 +101,7 @@ csi.sample_name AS sampleName, csi.sample_model AS sampleModel, csi.manufacturing_no AS manufacturingNo, - csi.measure_category AS measureCategory, + bor.measure_category AS measureCategory, bo.order_code AS orderCode, su.name AS measurePersonName FROM business_certificate_report bcr @@ -111,7 +111,9 @@ ON bcr.sample_id=csi.id LEFT JOIN sys_user su ON bcr.measure_person_id=su.id - WHERE bcr.is_del = 0 + LEFT JOIN business_original_record bor + ON bcr.original_record_id=bor.id + WHERE bcr.is_del = 0 and bor.is_del = 0 AND approval_status = #{request.approvalStatus} AND bcr.create_user = #{request.createUserId} @@ -151,7 +153,7 @@ csi.manufacturing_no AS manufacturingNo, bo.order_code AS orderCode, su.name AS measurePersonName, - csi.measure_category AS measureCategory + bor.measure_category AS measureCategory FROM business_certificate_report bcr LEFT JOIN business_order bo ON bcr.order_id=bo.id @@ -159,7 +161,9 @@ ON bcr.sample_id=csi.id LEFT JOIN sys_user su ON bcr.measure_person_id=su.id - WHERE bcr.is_del = 0 + LEFT JOIN business_original_record bor + ON bcr.original_record_id=bor.id + WHERE bcr.is_del = 0 and bor.is_del = 0 and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')