gongchunyi
5 小时以前 7dae2509ddb7d918f0ef0450a09ed721f6c7540f
src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
@@ -435,10 +435,21 @@
    <select id="invoiceLedgerSalesAccount" resultType="com.ruoyi.sales.dto.InvoiceLedgerDto">
        SELECT
        T2.id,
        T1.sales_contract_no,
        T1.contract_amount AS invoice_total,
        IFNULL(SUM(T2.receipt_payment_amount), 0) AS receipt_payment_amount,
        IFNULL((T1.contract_amount - IFNULL(SUM(T2.receipt_payment_amount), 0)), 0) AS unReceipt_payment_amount,
        IFNULL(T2.receipt_payment_amount, 0) AS receipt_payment_amount,
        IFNULL((
        T1.contract_amount - IFNULL((
        SELECT SUM(T3.receipt_payment_amount)
        FROM receipt_payment T3
        WHERE T3.sales_ledger_id = T1.id
        AND (
        T3.receipt_payment_date &lt; T2.receipt_payment_date
        OR (T3.receipt_payment_date = T2.receipt_payment_date AND T3.id &lt;= T2.id)
        )
        ), 0)
        ), 0) AS unReceipt_payment_amount,
        T2.receipt_payment_date
        FROM sales_ledger T1
        INNER JOIN receipt_payment T2 ON T1.id = T2.sales_ledger_id
@@ -448,7 +459,7 @@
                AND T1.customer_name LIKE CONCAT ('%', #{invoiceLedgerDto.searchText}, '%')
            </if>
        </where>
        GROUP BY T1.id, T1.sales_contract_no, T1.contract_amount, T2.receipt_payment_date
        ORDER BY T2.receipt_payment_date ASC, T2.id ASC
    </select>
</mapper>