yys 增值税，分页

maven

8 天以前 52e83f014b2424332583e44aa938ffac216d5251

 src/main/resources/mapper/sales/ReceiptPaymentMapper.xml

@@ -79,7 +79,7 @@
        T4.invoiceFileName,
        T5.product_category,
        IFNULL(T6.receipt_payment_amount_total ,0) AS receipt_payment_amount_total,
        (T1.invoice_total - IFNULL(T6.receipt_payment_amount_total ,0)) AS no_receipt_amount
        (T1.invoice_total - IFNULL(T6.receipt_payment_amount_total, 0)) AS noReceiptAmount
        FROM invoice_ledger T1
        LEFT JOIN invoice_registration_product T2 ON T2.id = T1.invoice_registration_product_id
        LEFT JOIN sales_ledger T3 ON T3.id = T2.sales_ledger_id
@@ -87,12 +87,16 @@
        SELECT
        invoice_ledger_id,
        GROUP_CONCAT( name ORDER BY id ASC SEPARATOR ' | ') AS invoiceFileName
        FROM invoice_ledger_file GROUP BY invoice_ledger_id
        FROM invoice_ledger_file
        GROUP BY invoice_ledger_id
        ) T4 ON T4.invoice_ledger_id = T1.id
        LEFT JOIN sales_ledger_product T5 ON T2.sales_ledger_product_id = T5.id
        LEFT JOIN (
        SELECT SUM(receipt_payment_amount) AS receipt_payment_amount_total,invoice_ledger_id FROM receipt_payment GROUP
        BY invoice_ledger_id
        SELECT
        SUM(receipt_payment_amount) AS receipt_payment_amount_total,
        invoice_ledger_id
        FROM receipt_payment
        GROUP BY invoice_ledger_id
        ) T6 ON T1.id = T6.invoice_ledger_id
        <where>
            <if test="req.customerName != null and req.customerName !=''">
@@ -113,8 +117,13 @@
            <if test="req.invoiceDateEnd != null and req.invoiceDateEnd != '' ">
                AND  T1.invoice_date &lt;= DATE_FORMAT(#{req.invoiceDateEnd},'%Y-%m-%d')
            </if>
            <if test="req.status != null and req.status">
                and (T1.invoice_total - IFNULL(T6.receipt_payment_amount_total, 0)) &gt; 0
            </if>
        </where>
        ORDER BY T2.create_time DESC

        ORDER BY IFNULL(T2.create_time, T1.create_time) DESC

    </select>

    <select id="invoiceInfo" resultType="com.ruoyi.sales.dto.InvoiceLedgerDto">