From 256f758a45c9b00a9248b02345ee1d6f52869e08 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 05 十一月 2025 09:36:58 +0800
Subject: [PATCH] yys 1.导出接口开发 2.营销管理-回款登记-回款状态（回款完成，未完成） 3.采购管理-付款登记-加一个付款进度 4.采购管理-付款流水-采购合同号筛选 5.仓储物流-所有-查询条件加一个日期 6.仓储物流-入库管理-加一个库存预警数量字段 7.生产管控-生产订单-加一个订单状态-已完成、未完成 8.协同办公-通知公告-加一个时间限制，过时后状态改为已过期
---
src/main/resources/mapper/sales/ReceiptPaymentMapper.xml | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml b/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
index 26ef5f8..a52038b 100644
--- a/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
+++ b/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 >= DATE_FORMAT(#{req.invoiceDateStart},'%Y-%m-%d')
+ </if>
+ <if test="req.invoiceDateEnd != null and req.invoiceDateEnd != '' ">
+ AND T1.invoice_date <= 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,
--
Gitblit v1.9.3