From 04f9ca8c6381d660c60160a9ce3d03b52c5957a2 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 28 三月 2026 09:51:29 +0800
Subject: [PATCH] 销售和采购审批

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

diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index 7ce76a8..e9d6ee5 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">
@@ -56,6 +56,8 @@
         T1.attachment_materials,
         T1.tenant_id,
         T1.contract_amount,
+        T1.approval_status,
+        T1.sales_type,
         T1.execution_date,
         T2.nick_name AS entry_person_name,
         T1.payment_method
@@ -81,6 +83,10 @@
             <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>
+    order by T1.entry_date desc
     </select>
-</mapper>
\ No newline at end of file
+</mapper>

--
Gitblit v1.9.3