From 7911497ffa51bd41fc334153b2a456ff02554747 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期二, 01 四月 2025 15:20:37 +0800
Subject: [PATCH] 整体流程测试修改0401-2

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

diff --git a/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml b/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml
index 43d7177..e75ca39 100644
--- a/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml
+++ b/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml
@@ -18,4 +18,33 @@
         <result property="updateTime" column="update_time"/>
         <result property="delFlag" column="del_flag"/>
   </resultMap>
+    <select id="pageNew" resultType="com.by4cloud.platformx.device.entity.vo.ReceivingNotePageVo">
+		select
+			rn.id,
+			rn.resource_type ,
+			rn.release_date ,
+			rn.release_code,
+			dm.manufacturer_name,
+			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