From feb86efc4e8a8d2da00e4832bcd81825726617bf Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 04 六月 2026 13:48:25 +0800
Subject: [PATCH] feat(iot): 物联设备接口新增存放位置字段
---
src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml | 24 +++++-------------------
1 files changed, 5 insertions(+), 19 deletions(-)
diff --git a/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml b/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml
index d29d24a..2c58276 100644
--- a/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml
+++ b/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml
@@ -51,6 +51,7 @@
<if test="documentationBorrowManagement.entryDateEnd != null and documentationBorrowManagement.entryDateEnd != ''">
and borrow_date <= DATE_FORMAT(#{documentationBorrowManagement.entryDateEnd},'%Y-%m-%d')
</if>
+ order by dbm.create_time desc
</select>
<select id="export" resultType="com.ruoyi.warehouse.dto.DocumentationBorrowManagementDto">
select dbm.*,doc.doc_name
@@ -76,28 +77,13 @@
and borrow_date <= DATE_FORMAT(#{documentationBorrowManagement.entryDateEnd},'%Y-%m-%d')
</if>
</select>
- <select id="exportrevent" resultType="com.ruoyi.warehouse.dto.ReturnExportDto">
+ <select id="list" resultType="com.ruoyi.warehouse.dto.DocumentationBorrowManagementDto">
select dbm.*,doc.doc_name
from documentation_borrow_management dbm
LEFT JOIN documentation doc on doc.id = dbm.documentation_id
- where dbm.returner IS NOT NULL
- <if test="documentationBorrowManagement.borrowStatus != null">
- and borrow_status = #{documentationBorrowManagement.borrowStatus}
- </if>
- <if test="documentationBorrowManagement.documentationId != null">
- and documentation_id = #{documentationBorrowManagement.documentationId}
- </if>
- <if test="documentationBorrowManagement.borrower != null">
- and borrower like concat('%',#{documentationBorrowManagement.borrower},'%')
- </if>
- <if test="documentationBorrowManagement.returner != null">
- and returner like concat('%',#{documentationBorrowManagement.returner},'%')
- </if>
- <if test="documentationBorrowManagement.entryDateStart != null and documentationBorrowManagement.entryDateStart != ''">
- and borrow_date >= DATE_FORMAT(#{documentationBorrowManagement.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="documentationBorrowManagement.entryDateEnd != null and documentationBorrowManagement.entryDateEnd != ''">
- and borrow_date <= DATE_FORMAT(#{documentationBorrowManagement.entryDateEnd},'%Y-%m-%d')
+ <if test="ew != null">
+ ${ew.customSqlSegment}
</if>
</select>
+
</mapper>
--
Gitblit v1.9.3