maven
2 天以前 5954d53400d786dadf7c3023e6e1b921e7293116
src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
@@ -129,21 +129,23 @@
        SELECT * FROM(
             SELECT
                 T1.issue_date AS happenTime,
                 IFNULL(T1.invoice_amount,0) AS invoiceAmount,
                 sum(IFNULL(T1.invoice_amount,0)) AS invoiceAmount,
                 '1' AS type,
                 0 AS currentPaymentAmount
             FROM
                 ticket_registration T1
                     LEFT JOIN purchase_ledger T2 ON T1.purchase_ledger_id = T2.id
             WHERE T2.supplier_id = #{supplierId}
             GROUP BY T1.issue_date
             UNION
             SELECT
                 payment_date AS happenTime,
                 0 AS invoiceAmount,
                 '0' AS type,
                 current_payment_amount AS currentPaymentAmount
                 sum(ifnull(current_payment_amount,0)) AS currentPaymentAmount
             FROM payment_registration
             WHERE supplier_id = #{supplierId}
             GROUP BY payment_date
        ) T1
        ORDER BY T1.happenTime ASC