From 2a4d9802f9117d5d110e63ddaa41aada68731c4d Mon Sep 17 00:00:00 2001 From: liyong <18434998025@163.com> Date: 星期一, 16 六月 2025 17:08:51 +0800 Subject: [PATCH] tenantId修改类型 + 客户导入+ 供应商导入+产品导入 --- src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml index 16e4960..61bbdfc 100644 --- a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml +++ b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml @@ -125,4 +125,50 @@ GROUP BY ticket_registration_id </select> + <select id="getPaymentRecordList" resultType="com.ruoyi.purchase.dto.PaymentHistoryRecordVo"> + SELECT * FROM( + SELECT + T1.issue_date AS happenTime, + IFNULL(T1.invoice_amount,0) AS invoiceAmount, + '1' AS type, + 0 AS currentPaymentAmount + FROM + ticket_registration T1 + LEFT JOIN purchase_ledger T2 ON T1.purchase_ledger_id = T2.id + WHERE T2.supplier_id = #{supplierId} + UNION + SELECT + payment_date AS happenTime, + 0 AS invoiceAmount, + '0' AS type, + current_payment_amount AS currentPaymentAmount + FROM payment_registration + WHERE supplier_id = #{supplierId} + ) T1 + ORDER BY T1.happenTime ASC + + </select> + + <select id="paymentHistoryListPage" resultType="com.ruoyi.purchase.dto.PaymentRegistrationDto"> + SELECT + T1.payment_date, + T2.supplier_name, + T1.current_payment_amount, + T1.payment_method, + T3.nick_name AS registrant, + T1.registrationt_date + FROM + payment_registration T1 + LEFT JOIN + supplier_manage T2 ON T1.supplier_id = T2.id + LEFT JOIN + sys_user T3 ON T3.user_id = T1.registrant_id + <where> + <if test="params.searchText != null and params.searchText != '' "> + AND T2.supplier_name LIKE CONCAT('%',#{params.searchText},'%') + </if> + </where> + ORDER BY T1.payment_date,T1.create_time DESC + </select> + </mapper> \ No newline at end of file -- Gitblit v1.9.3