From 2f6bd04715eba821713b9e1492999b7e5be7fcdb Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期四, 27 三月 2025 15:32:33 +0800
Subject: [PATCH] 租赁台账

---
 platformx-device-biz/src/main/resources/mapper/ReceivingNoteItemMapper.xml |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/platformx-device-biz/src/main/resources/mapper/ReceivingNoteItemMapper.xml b/platformx-device-biz/src/main/resources/mapper/ReceivingNoteItemMapper.xml
index 48f45ec..4ff3176 100644
--- a/platformx-device-biz/src/main/resources/mapper/ReceivingNoteItemMapper.xml
+++ b/platformx-device-biz/src/main/resources/mapper/ReceivingNoteItemMapper.xml
@@ -20,17 +20,23 @@
 		select
 			rni.id,
 			rni.num  ,
+			rni.device_code,
+			rni.device_name ,
+			rni.device_models ,
+			rni.key_parameter ,
+			rni.metering_unit ,
 			rni.`output` ,
-			ci.name contractItemName,
 			rn.release_code
 		from
 			receiving_note_item rni
-				join contract_item ci on rni.contract_item_id = ci.id
-				join receiving_note rn on rn.id = rni.note_id
+		join receiving_note rn on rn.id = rni.note_id
 		where
 			rni.del_flag = '0'
-		<if test="queryDTO.contractItemName != null and queryDTO.contractItemName !=''">
-			and c.name like CONCAT('%', #{queryDTO.contractItemName}, '%')
+		<if test="queryDTO.releaseCode != null and queryDTO.releaseCode !=''">
+			and rn.release_code like CONCAT('%', #{queryDTO.releaseCode}, '%')
+		</if>
+		<if test="queryDTO.noteId != null and queryDTO.noteId !=''">
+			and rni.note_id = #{queryDTO.noteId}
 		</if>
 	</select>
 </mapper>

--
Gitblit v1.9.1