diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml index f16c7ec5..6e607072 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml @@ -865,8 +865,8 @@ slt_agreement_info WHERE agreement_id = #{agreementId} - AND - type_id = #{typeId} + AND type_id = #{typeId} + AND status = 0 AND ma_id = #{maId} @@ -903,10 +903,13 @@ ma_type mt LEFT JOIN ma_type mt2 ON mt.parent_id = mt2.type_id LEFT JOIN ma_machine mm ON mt.type_id = mm.type_id + LEFT JOIN slt_agreement_info sai ON sai.ma_id = mm.ma_id LEFT JOIN sys_dic sd ON sd.id = mm.ma_status WHERE - mm.ma_status = '16' + mm.ma_status = '16' AND mt.type_id = #{typeId} + AND sai.`status` = 0 + AND sai.agreement_id = #{agreementId} AND mm.ma_code like concat('%', #{maCode}, '%')