From d9d8b1eb440d455252e9859b2294b8a55366baba Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 02 四月 2025 10:48:29 +0800
Subject: [PATCH] 招标 中标 台账 验收 新增名称字段对应表单列表调整

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

diff --git a/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml b/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml
index 2ad25b2..e75ca39 100644
--- a/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml
+++ b/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml
@@ -25,17 +25,26 @@
 			rn.release_date ,
 			rn.release_code,
 			dm.manufacturer_name,
-			sd.name deptName
+			sd.name deptName,
+			c.name contractName
 		from
 			receiving_note rn
 		join device_manufacturer dm on
 			rn.manufacturer_id  = dm.id
 		join platformxx_boot.sys_dept sd on
 			rn.dept_id = sd.dept_id
+		join contract c on
+			c.id = rn.contract_id
 		where
 			rn.del_flag = '0'
 		<if test="queryDTO.releaseCode != null and queryDTO.releaseCode !=''">
 			and rn.release_code like CONCAT('%', #{queryDTO.releaseCode}, '%')
 		</if>
+		<if test="queryDTO.contractName != null and queryDTO.contractName !=''">
+			and c.name like CONCAT('%', #{queryDTO.contractName}, '%')
+		</if>
+		order by
+			rn.create_time
+		desc
 	</select>
 </mapper>

--
Gitblit v1.9.1