From 4cceee2ced8d9ed1d8e8d08213372cc8a77ac601 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 30 三月 2026 11:24:54 +0800
Subject: [PATCH] yys 转移设备相关代码

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

diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index 4e1040e..b06878b 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -10,7 +10,7 @@
         WHERE sales_contract_no LIKE CONCAT('%',#{datePart},'%')
     </select>
     <select id="getSalesNo" resultType="com.ruoyi.sales.pojo.SalesLedger">
-        
+    
     </select>
 
     <select id="selectSalesLedgerList" resultType="com.ruoyi.sales.pojo.SalesLedger">
@@ -29,7 +29,7 @@
             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
@@ -57,6 +57,8 @@
         T1.tenant_id,
         T1.contract_amount,
         T1.execution_date,
+        T1.approval_status,
+        T1.sales_type,
         T2.nick_name AS entry_person_name,
         T1.payment_method
         FROM
@@ -81,6 +83,9 @@
             <if test="salesLedgerDto.entryDateEnd != null and salesLedgerDto.entryDateEnd != '' ">
                 AND  T1.entry_date &lt;= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
             </if>
+             <if test="salesLedgerDto.approvalStatus != null">
+                AND  T1.approval_status =#{salesLedgerDto.approvalStatus}
+            </if>
         </where>
     </select>
-</mapper>
\ No newline at end of file
+</mapper>

--
Gitblit v1.9.3