From adf58ddc0337678c2a6770fe8687e54a44998c0d Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期三, 02 四月 2025 15:43:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
platformx-device-biz/src/main/resources/mapper/DeviceScrapMapper.xml | 21 +++++++++++++++++++++
1 files changed, 21 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..6137855 100644
--- a/platformx-device-biz/src/main/resources/mapper/DeviceScrapMapper.xml
+++ b/platformx-device-biz/src/main/resources/mapper/DeviceScrapMapper.xml
@@ -18,4 +18,25 @@
<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>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1