From 3938a9d9f636dfa538443fc9883113c697c1f0ff Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 11 八月 2026 14:48:40 +0800
Subject: [PATCH] fix: 清理配置文件

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

diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index a5650f9..ed6c26c 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -95,7 +95,7 @@
                 AND T1.entry_date &lt;= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
             </if>
         </where>
-        order by T1.entry_date desc
+        order by T1.entry_date desc, T1.sales_contract_no desc
     </select>
 
     <select id="selectIncomeStats" resultType="com.ruoyi.home.dto.IncomeExpenseAnalysisDto">
@@ -110,17 +110,19 @@
         FROM sales_ledger
         GROUP BY customer_name
     </select>
+
     <select id="listSalesLedgerAndShipped" resultType="com.ruoyi.sales.dto.SalesLedgerDto">
         select distinct sl.id as 'disId', sl.* from
         sales_ledger sl
         left join sales_ledger_product slp on sl.id = slp.sales_ledger_id
         left join shipping_info si on slp.id = si.sales_ledger_product_id
-        where si.status = '宸插彂璐�'
-        <if test="ew.customerName != null and ew.customerName != '' ">
-            and sl.customer_name like concat('%',#{ew.customerName},'%')
+        where si.status = '瀹℃牳閫氳繃'
+        <if test="ew.customerId != null and ew.customerId != '' ">
+            and sl.customer_id = #{ew.customerId}
         </if>
         order by sl.execution_date desc
     </select>
+
     <select id="selectPurchaseReportVoPage" resultType="com.ruoyi.purchase.vo.PurchaseReportVo">
         select sl.sales_contract_no customerContractNo,
                c.customer_name,
@@ -132,12 +134,10 @@
         from sales_ledger sl
         left join purchase_ledger pl on sl.id = pl.sales_ledger_id
         left join customer c on sl.customer_id = c.id
-        <where>
-            <if test="customerName != null and customerName != '' ">
-                and c.customer_name like concat('%',#{customerName},'%')
-            </if>
-        </where>
-        order by sl.entry_date desc
+        where 1=1
+        <if test="customerName != null and customerName != '' ">
+            and c.customer_name like concat('%',#{customerName},'%')
+        </if>
     </select>
 
 </mapper>

--
Gitblit v1.9.3