diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index 9b1e5ec..545bc42 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -64,38 +64,38 @@ ) bo JOIN ( - SELECT * - FROM business_order_sample_relation bosr - WHERE 1=1 - - AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) - - - AND (bosr.sample_status = 2 OR bosr.sample_status = 3) - - - AND bosr.sample_status = #{request.sampleStatus} - - - and id in - - #{id} - - + SELECT * + FROM business_order_sample_relation bosr + WHERE 1=1 + + AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) + + + AND bosr.sample_status = 3 + + + AND bosr.sample_status = #{request.sampleStatus} + + + and id in + + #{id} + + ) bosr ON bo.id = bosr.order_id JOIN ( - SELECT * - FROM customer_sample_info csi - WHERE is_del=0 - - AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') - - - AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') - - - AND csi.sample_belong = #{request.sampleBelong} - + SELECT * + FROM customer_sample_info csi + WHERE is_del=0 + + AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') + + + AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') + + + AND csi.sample_belong = #{request.sampleBelong} + ) csi ON csi.id = bosr.sample_id