From 820e9e9e5e4ce7e8fb477ae8f2573dab1f2074de Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 27 五月 2026 11:47:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

---
 src/main/resources/mapper/warehouse/DocumentationReturnManagementMapper.xml |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/warehouse/DocumentationReturnManagementMapper.xml b/src/main/resources/mapper/warehouse/DocumentationReturnManagementMapper.xml
index dabc4f0..7545c55 100644
--- a/src/main/resources/mapper/warehouse/DocumentationReturnManagementMapper.xml
+++ b/src/main/resources/mapper/warehouse/DocumentationReturnManagementMapper.xml
@@ -28,6 +28,7 @@
         <if test="documentationReturnManagement.entryDateEnd != null and documentationReturnManagement.entryDateEnd != ''">
             and return_date &lt;= DATE_FORMAT(#{documentationReturnManagement.entryDateEnd},'%Y-%m-%d')
         </if>
+        order by dbm.create_time desc
     </select>
 
     <select id="exportrevent" resultType="com.ruoyi.warehouse.dto.ReturnExportDto">
@@ -35,8 +36,8 @@
         from documentation_return_management dbm
         LEFT JOIN documentation doc on doc.id = dbm.documentation_id
         where dbm.returner IS NOT NULL
-        <if test="documentationReturnManagement.returnStatus != null">
-            and return_status = #{documentationReturnManagement.returnStatus}
+        <if test="documentationReturnManagement.borrowStatus != null">
+            and borrow_status = #{documentationReturnManagement.borrowStatus}
         </if>
         <if test="documentationReturnManagement.documentationId != null">
             and documentation_id = #{documentationReturnManagement.documentationId}

--
Gitblit v1.9.3