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 | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/platformx-device-biz/src/main/resources/mapper/InventoryFlowWaterMapper.xml b/platformx-device-biz/src/main/resources/mapper/InventoryFlowWaterMapper.xml
index 9f9ab0b..bf5c814 100644
--- a/platformx-device-biz/src/main/resources/mapper/InventoryFlowWaterMapper.xml
+++ b/platformx-device-biz/src/main/resources/mapper/InventoryFlowWaterMapper.xml
@@ -21,9 +21,9 @@
<select id="pageNew" resultType="com.by4cloud.platformx.device.entity.vo.InventoryFlowWaterPageVo">
select
ifw.id,
- d.name devicName,
+ d.name deviceName,
dc.name className,
- d.create_time ,
+ ifw.create_time ,
ifw.operate_type,
di.serial_no
from
@@ -36,5 +36,12 @@
<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