From fc0db201e10ed1cc6d68aaf0a37d65933398c2f6 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 28 三月 2025 16:05:23 +0800
Subject: [PATCH] 库存流水 合同 验收 台账 厂商 招标 中标 技术协议 列表根据时间倒序

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

diff --git a/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml b/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml
index 88e1e79..456c1da 100644
--- a/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml
+++ b/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml
@@ -21,17 +21,24 @@
     <select id="pageNew" resultType="com.by4cloud.platformx.device.entity.vo.ReceivingNotePageVo">
 		select
 			rn.id,
-			rn.release_comp_name ,
-			rn.release_person,
+			rn.resource_type ,
+			rn.release_date ,
 			rn.release_code,
-			c.name contractName
+			dm.manufacturer_name,
+			sd.name deptName
 		from
 			receiving_note rn
-				join contract c on rn.contract_id = c.id
+		join device_manufacturer dm on
+			rn.manufacturer_id  = dm.id
+		join platformxx_boot.sys_dept sd on
+			rn.dept_id = sd.dept_id
 		where
 			rn.del_flag = '0'
-		<if test="queryDTO.contractName != null and queryDTO.contractName !=''">
-			and c.name like CONCAT('%', #{queryDTO.contractName}, '%')
+		<if test="queryDTO.releaseCode != null and queryDTO.releaseCode !=''">
+			and rn.release_code like CONCAT('%', #{queryDTO.releaseCode}, '%')
 		</if>
+		order by
+			rn.create_time
+		desc
 	</select>
 </mapper>

--
Gitblit v1.9.1