From fa59bd5bf64f818111b26744a3b51b936ab6f389 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 01 七月 2025 09:50:00 +0800
Subject: [PATCH] 2025-07-01 bug修改
---
src/main/resources/mapper/sales/SalesLedgerMapper.xml | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index 118d092..dd7c80f 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -30,6 +30,7 @@
T1.contract_amount,
T1.execution_date,
T2.nick_name AS entry_person_name
+ T1.payment_method
FROM
sales_ledger T1
LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id
@@ -56,7 +57,8 @@
T1.tenant_id,
T1.contract_amount,
T1.execution_date,
- T2.nick_name AS entry_person_name
+ T2.nick_name AS entry_person_name,
+ T1.payment_method
FROM
sales_ledger T1
LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id
@@ -64,12 +66,18 @@
<if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' ">
T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
</if>
- <if test="salesLedgerDto.customerContractNo != null and salesLedgerDto.customerContractNo != '' ">
- T1.sales_contract_no LIKE CONCAT('%',#{salesLedgerDto.customerContractNo},'%')
+ <if test="salesLedgerDto.customerContractNo != null and salesLedgerDto.customerContractNo !='' ">
+ T1.customer_contract_no LIKE CONCAT('%',#{salesLedgerDto.customerContractNo},'%')
+ </if>
+ <if test="salesLedgerDto.salesContractNo != null and salesLedgerDto.salesContractNo != '' ">
+ T1.sales_contract_no LIKE CONCAT('%',#{salesLedgerDto.salesContractNo},'%')
</if>
<if test="salesLedgerDto.projectName != null and salesLedgerDto.projectName != '' ">
T1.project_name LIKE CONCAT('%',#{salesLedgerDto.projectName},'%')
</if>
+ <if test="salesLedgerDto.entryDate != null and salesLedgerDto.entryDate != '' ">
+ T1.entry_date = DATE_FORMAT(#{salesLedgerDto.entryDate},'%Y-%m-%d')
+ </if>
</where>
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3