From 5c5fc86ebb905d5c0d09caef3d80f38b2aba6f18 Mon Sep 17 00:00:00 2001
From: 青城 <1662047068@qq.com>
Date: 星期三, 09 七月 2025 09:16:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into pim-qiao

---
 src/main/resources/mapper/sales/SalesLedgerMapper.xml |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index 96c297c..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,22 +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 !='' ">
-                T1.customer_contract_no LIKE CONCAT('%',#{salesLedgerDto.customerContractNo},'%')
+                AND  T1.customer_contract_no LIKE CONCAT('%',#{salesLedgerDto.customerContractNo},'%')
             </if>
-            <if test="salesLedgerDto.sales_contract_no != null and salesLedgerDto.sales_contract_no != '' ">
-                T1.sales_contract_no LIKE CONCAT('%',#{salesLedgerDto.customerContractNo},'%')
+            <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 != '' ">
-                T1.project_name LIKE CONCAT('%',#{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