From 73e27a267afa5eb2c94b3c70aa3556aaef690cea Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期二, 19 八月 2025 09:07:07 +0800
Subject: [PATCH] 修改完善1
---
src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml b/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml
index 9d54137..f28eadd 100644
--- a/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml
+++ b/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml
@@ -28,8 +28,12 @@
<!-- create_time,create_user,update_time,-->
<!-- update_user,tenant_id-->
<!-- </sql>-->
- <select id="listPage" resultType="com.ruoyi.warehouse.pojo.DocumentationBorrowManagement">
- select *from documentation_borrow_management
+ <select id="listPage" resultType="com.ruoyi.warehouse.dto.DocumentationBorrowManagementDto">
+ select dbm.*,doc.doc_name,su.nick_name,sur.nick_name as return_nick_name
+ from documentation_borrow_management dbm
+ LEFT JOIN documentation doc on doc.id = dbm.documentation_id
+ LEFT JOIN sys_user su on su.user_id = dbm.borrower_id
+ LEFT JOIN sys_user sur on sur.user_id = dbm.returner_id
where 1=1
<if test="documentationBorrowManagement.borrowStatus != null">
and borrow_status = #{documentationBorrowManagement.borrowStatus}
@@ -39,6 +43,9 @@
</if>
<if test="documentationBorrowManagement.borrowerId != null">
and borrower_id = #{documentationBorrowManagement.borrowerId}
+ </if>
+ <if test="documentationBorrowManagement.returnerId != null">
+ and returner_id = #{documentationBorrowManagement.returnerId}
</if>
<if test="documentationBorrowManagement.entryDateStart != null and documentationBorrowManagement.entryDateStart != ''">
and borrow_date >= DATE_FORMAT(#{documentationBorrowManagement.entryDateStart},'%Y-%m-%d')
@@ -70,11 +77,12 @@
</if>
</select>
<select id="exportrevent" resultType="com.ruoyi.warehouse.dto.ReturnExportDto">
- select dbm.*,doc.doc_name,su.nick_name,su.nick_name as return_nick_name
+ select dbm.*,doc.doc_name,su.nick_name,sur.nick_name as return_nick_name
from documentation_borrow_management dbm
LEFT JOIN documentation doc on doc.id = dbm.documentation_id
LEFT JOIN sys_user su on su.user_id = dbm.borrower_id
- where 1=1
+ LEFT JOIN sys_user sur on sur.user_id = dbm.returner_id
+ where sur.nick_name IS NOT NULL
<if test="documentationBorrowManagement.borrowStatus != null">
and borrow_status = #{documentationBorrowManagement.borrowStatus}
</if>
--
Gitblit v1.9.3