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/InventoryFlowWaterMapper.xml | 20 ++++++++++++++++++++
1 files changed, 20 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..a2d92d1 100644
--- a/platformx-device-biz/src/main/resources/mapper/InventoryFlowWaterMapper.xml
+++ b/platformx-device-biz/src/main/resources/mapper/InventoryFlowWaterMapper.xml
@@ -18,4 +18,24 @@
<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>
+ order by ifw.create_time desc
+ </select>
</mapper>
--
Gitblit v1.9.1