diff --git a/src/main/resources/cashMapper/CashRefundMapper.xml b/src/main/resources/cashMapper/CashRefundMapper.xml index f4f269c..daa938f 100644 --- a/src/main/resources/cashMapper/CashRefundMapper.xml +++ b/src/main/resources/cashMapper/CashRefundMapper.xml @@ -336,7 +336,7 @@ crc.good_num as goodsNum, crc.num_unit, crr.refund_model, - crr.refund_currency, + r.rate_name as refund_currency, crr.refund_amount, crr.refund_channels, crr.refund_voucher, @@ -349,13 +349,14 @@ crr.submitter_id, crr.related_id, crr.refund_reason, - la.area_servise, - la.area_finance, - la.area_charge, - la.head_finance - from cash_record_refund crr - left join cash_record_collection crc on crc.id = crr.related_id - left join lhl_audit la on la.id = crr.audit_id + la.area_servise, + la.area_finance, + la.area_charge, + la.head_finance + from cash_record_refund crr + left join cash_record_collection crc on crc.id = crr.related_id + left join lhl_audit la on la.id = crr.audit_id + left join rate r on r.id = crr.refund_currency and crr.status = #{status} @@ -387,7 +388,7 @@ ) - AND crr.refund_currency like CONCAT('%', #{refundCurrency}, '%') + AND r.rate_name like CONCAT('%', #{refundCurrency}, '%') and crr.refund_channels like CONCAT('%', #{refundChannels}, '%') @@ -435,13 +436,14 @@ crr.remark, crr.reject_reason, crr.refund_model, - crr.refund_currency, + r.rate_name as refund_currency, crr.refund_amount, crr.refund_channels, crr.refund_time, crr.refund_remark, crr.refund_voucher from cash_record_refund crr + left join rate r on r.id = crr.refund_currency where crr.id = #{id}