yys 巡检管理修改

maven

6 天以前 2a8729301fa0e4b20a2cf14273790cd3640ae5a6

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

@@ -120,6 +120,10 @@
            <if test="req.status != null and req.status">
                and (T1.invoice_total - IFNULL(T6.receipt_payment_amount_total, 0)) &gt; 0
            </if>
            <if test="req.timeOut != null and req.timeOut">
                AND T1.invoice_date &lt; DATE_SUB(CURDATE(), INTERVAL 15 DAY)
                AND (T1.invoice_total - IFNULL(T6.receipt_payment_amount_total ,0)) > 0
            </if>
        </where>

        ORDER BY IFNULL(T2.create_time, T1.create_time) DESC
@@ -432,5 +436,22 @@
        </where>

    </select>
    <select id="invoiceLedgerSalesAccount" resultType="com.ruoyi.sales.dto.InvoiceLedgerDto">
        SELECT
        T1.sales_contract_no,
        SUM(contract_amount) AS invoice_total,
        IFNULL( SUM(T2.receipt_payment_amount) , 0 ) AS receipt_payment_amount,
        IFNULL((IFNULL(SUM(contract_amount),0)  - IFNULL(SUM(T2.receipt_payment_amount),0)),0) AS unReceipt_payment_amount,
        T2.receipt_payment_date
        FROM sales_ledger T1
        LEFT JOIN receipt_payment T2 ON T1.id = T2.sales_ledger_id
        <where>
            T1.customer_id = #{invoiceLedgerDto.customerId}
            <if test="invoiceLedgerDto.searchText != null and invoiceLedgerDto.searchText != '' ">
                T1.customer_name LIKE CONCAT ('%',#{invoiceLedgerDto.searchText},'%')
            </if>
        </where>
        GROUP BY T1.sales_contract_no,T2.receipt_payment_date
    </select>

</mapper>