From 14fbcd6bf88c047bf9b5685cdf8fb06ccf08eb49 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期四, 10 四月 2025 14:37:35 +0800
Subject: [PATCH] 设备技术协议和设备流水搜索条件

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

diff --git a/platformx-device-biz/src/main/resources/mapper/InventoryFlowWaterMapper.xml b/platformx-device-biz/src/main/resources/mapper/InventoryFlowWaterMapper.xml
index 3ca2275..bf5c814 100644
--- a/platformx-device-biz/src/main/resources/mapper/InventoryFlowWaterMapper.xml
+++ b/platformx-device-biz/src/main/resources/mapper/InventoryFlowWaterMapper.xml
@@ -18,4 +18,30 @@
         <result property="updateTime" column="update_time"/>
         <result property="delFlag" column="del_flag"/>
   </resultMap>
+    <select id="pageNew" resultType="com.by4cloud.platformx.device.entity.vo.InventoryFlowWaterPageVo">
+		select
+			ifw.id,
+			d.name deviceName,
+			dc.name className,
+			ifw.create_time ,
+			ifw.operate_type,
+			di.serial_no
+		from
+			inventory_flow_water ifw
+		join device d on d.id = ifw.device_id
+		join device_class dc on dc.id = ifw.class_id
+		join device_inventory di on di.id = ifw.inventory_id
+		where
+		      ifw.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 di.serial_no like CONCAT('%', #{queryDTO.serialNo}, '%')
+		</if>
+		<if test="queryDTO.className != null and queryDTO.className !=''">
+			and dc.name like CONCAT('%', #{queryDTO.className}, '%')
+		</if>
+			order by ifw.create_time desc
+	</select>
 </mapper>

--
Gitblit v1.9.1