From 608f0d2c05d86510d546a362e44c10feb601b3f1 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期二, 08 四月 2025 08:19:10 +0800
Subject: [PATCH] 优化项优化

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

diff --git a/platformx-device-biz/src/main/resources/mapper/DeviceScrapMapper.xml b/platformx-device-biz/src/main/resources/mapper/DeviceScrapMapper.xml
index 13c0b83..184a360 100644
--- a/platformx-device-biz/src/main/resources/mapper/DeviceScrapMapper.xml
+++ b/platformx-device-biz/src/main/resources/mapper/DeviceScrapMapper.xml
@@ -18,4 +18,26 @@
         <result property="updateTime" column="update_time"/>
         <result property="delFlag" column="del_flag"/>
   </resultMap>
+    <select id="pageNew" resultType="com.by4cloud.platformx.device.entity.vo.DeviceScrapPageVo">
+		select
+			ds.id,
+			d.name deviceName,
+			d.`number` deviceCode,
+			ds.serial_no,
+			ds.scrap_date ,
+			ds.status
+		from
+			device_scrap ds
+		join device d on
+			ds.device_id  = d.id
+		where
+			ds.del_flag='0'
+		<if test="queryDTO.deviceName != null and queryDTO.deviceName !=''">
+			and d.name like CONCAT('%', #{queryDTO.deviceName}, '%')
+		</if>
+		<if test="queryDTO.serialNo != null and queryDTO.serialNo !=''">
+			and ds.serial_no like CONCAT('%', #{queryDTO.serialNo}, '%')
+		</if>
+		order by ds.create_time desc
+	</select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1