Merge remote-tracking branch 'origin/master'

zss

2025-09-23 05b430789fa8b375acc6e4d4abd98f89c430e3a7

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

@@ -95,14 +95,23 @@
        BY invoice_ledger_id
        ) T6 ON T1.id = T6.invoice_ledger_id
        <where>
            <if test="c.customerName != null and c.customerName !=''">
                AND T3.customer_name LIKE CONCAT('%',#{c.customerName},'%')
            <if test="req.customerName != null and req.customerName !=''">
                AND T3.customer_name LIKE CONCAT('%',#{req.customerName},'%')
            </if>
            <if test="c.customerContractNo != null and c.customerContractNo !=''">
                AND T3.customer_contract_no LIKE CONCAT('%',#{c.customerContractNo},'%')
            <if test="req.invoiceLedgerId != null">
                AND T1.id = #{req.invoiceLedgerId}
            </if>
            <if test="c.projectName != null and c.projectName !=''">
                AND T3.project_name LIKE CONCAT('%',#{c.projectName},'%')
            <if test="req.customerContractNo != null and req.customerContractNo !=''">
                AND T3.customer_contract_no LIKE CONCAT('%',#{req.customerContractNo},'%')
            </if>
            <if test="req.projectName != null and req.projectName !=''">
                AND T3.project_name LIKE CONCAT('%',#{req.projectName},'%')
            </if>
            <if test="req.invoiceDateStart != null and req.invoiceDateStart != '' ">
                AND T1.invoice_date &gt;= DATE_FORMAT(#{req.invoiceDateStart},'%Y-%m-%d')
            </if>
            <if test="req.invoiceDateEnd != null and req.invoiceDateEnd != '' ">
                AND  T1.invoice_date &lt;= DATE_FORMAT(#{req.invoiceDateEnd},'%Y-%m-%d')
            </if>
        </where>
        ORDER BY T2.create_time DESC
@@ -180,6 +189,7 @@

    <select id="receiptPaymentHistoryListPage" resultType="com.ruoyi.sales.dto.ReceiptPaymentDto">
        SELECT
        T1.id,
        T1.receipt_payment_date,
        T5.customer_name,
        T1.receipt_payment_amount,