回款登记功能修改

chenrui

6 天以前 63ccaee5545740122a9d58983aa75d9da9de7530

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

@@ -5,39 +5,31 @@
<mapper namespace="com.ruoyi.sales.mapper.ReceiptPaymentMapper">
    <select id="receiptPaymentListPage" resultType="com.ruoyi.sales.dto.ReceiptPaymentDto">
        SELECT
            T1.id                 ,
            T1.sales_ledger_id        ,
            T1.sales_contract_no      ,
            T1.customer_id            ,
            T1.invoice_no             ,
            T1.invoice_amount         ,
            T1.tax_rate               ,
            T1.receipt_payment_type   ,
            T1.receipt_payment_amount ,
            T1.registrant             ,
            T1.receipt_payment_date   ,
            T1.create_time            ,
            T1.create_user            ,
            T1.update_time            ,
            T1.update_user            ,
            T1.tenant_id,
            T3.customer_contract_no,
            T2.customer_name
        FROM receipt_payment T1
        LEFT JOIN customer T2 ON T1.customer_id = T2.id
        LEFT JOIN sales_ledger T3 ON T1.sales_ledger_id = T3.id
            T4.customer_id,
            IFNULL(T5.invoice_total,0) AS invoice_total,
            T1.receipt_payment_amount,
            T1.receipt_payment_date
        FROM
            receipt_payment T1
        LEFT JOIN invoice_ledger T2 ON T1.invoice_ledger_id = T2.id
        LEFT JOIN invoice_registration_product T3 ON T2.invoice_registration_product_id = T3.id
        LEFT JOIN sales_ledger T4 ON T4.id = T3.sales_ledger_id
        LEFT JOIN (
            SELECT
                T3.customer_id,
                SUM( invoice_total ) AS invoice_total
            FROM
                invoice_ledger T1
            LEFT JOIN invoice_registration_product T2 ON T1.invoice_registration_product_id = T2.id
            LEFT JOIN sales_ledger T3 ON T3.id = T2.sales_ledger_id
            GROUP BY T3.customer_id
        ) T5 ON T5.customer_id = T4.customer_id
        <where>
            <if test="receiptPaymentDto.searchText != null and receiptPaymentDto.searchText != ''">
                AND (
                T2.customer_name LIKE CONCAT('%',#{receiptPaymentDto.searchText},'%')
                OR T1.sales_contract_no LIKE CONCAT('%',#{receiptPaymentDto.searchText},'%')
                )
            </if>
            <if test="receiptPaymentDto.customerId != null">
                AND T1.customer_id = #{receiptPaymentDto.customerId}
                AND T4.customer_id = #{receiptPaymentDto.customerId}
            </if>
        </where>
        ORDER BY  T1.receipt_payment_date ASC
        ORDER BY T1.receipt_payment_date ASC
    </select>

    <select id="receiptPaymentInfo" resultType="com.ruoyi.sales.dto.ReceiptPaymentDto">
@@ -119,4 +111,35 @@
        WHERE T1.id = #{id}
    </select>

    <select id="getReceiptAmount" resultType="java.math.BigDecimal">
        SELECT
            SUM( receipt_payment_amount ) AS total_amount
        FROM
            (
                SELECT
                    T1.receipt_payment_amount
                FROM
                    receipt_payment T1
                        LEFT JOIN invoice_ledger T2 ON T1.invoice_ledger_id = T2.id
                        LEFT JOIN invoice_registration_product T3 ON T2.invoice_registration_product_id = T3.id
                        LEFT JOIN sales_ledger T4 ON T4.id = T3.sales_ledger_id
                        LEFT JOIN (
                        SELECT
                            T3.customer_id,
                            SUM( invoice_total ) AS invoice_total
                        FROM
                            invoice_ledger T1
                                LEFT JOIN invoice_registration_product T2 ON T1.invoice_registration_product_id = T2.id
                                LEFT JOIN sales_ledger T3 ON T3.id = T2.sales_ledger_id
                        GROUP BY
                            T3.customer_id
                    ) T5 ON T5.customer_id = T4.customer_id
                WHERE
                    T4.customer_id = #{customerId}

                ORDER BY
                    T1.receipt_payment_date ASC
                    LIMIT #{total} ) AS limited_rows
    </select>

</mapper>