From beaa6e8dcf350fc50320518b9c92986785a2fac9 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 03 七月 2025 15:03:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/resources/mapper/sales/SalesLedgerMapper.xml |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index a9ad438..4e1040e 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,13 +57,29 @@
         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
         <where>
             <if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' ">
-                T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
+                AND  T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
+            </if>
+            <if test="salesLedgerDto.customerContractNo != null and salesLedgerDto.customerContractNo !='' ">
+                AND  T1.customer_contract_no LIKE CONCAT('%',#{salesLedgerDto.customerContractNo},'%')
+            </if>
+            <if test="salesLedgerDto.salesContractNo != null and salesLedgerDto.salesContractNo != '' ">
+                AND  T1.sales_contract_no LIKE CONCAT('%',#{salesLedgerDto.salesContractNo},'%')
+            </if>
+            <if test="salesLedgerDto.projectName != null and salesLedgerDto.projectName != '' ">
+                AND T1.project_name LIKE CONCAT('%',#{salesLedgerDto.projectName},'%')
+            </if>
+            <if test="salesLedgerDto.entryDateStart != null and salesLedgerDto.entryDateStart != '' ">
+               AND T1.entry_date &gt;= DATE_FORMAT(#{salesLedgerDto.entryDateStart},'%Y-%m-%d')
+            </if>
+            <if test="salesLedgerDto.entryDateEnd != null and salesLedgerDto.entryDateEnd != '' ">
+                AND  T1.entry_date &lt;= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
             </if>
         </where>
     </select>

--
Gitblit v1.9.3