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-api/src/main/java/com/by4cloud/platformx/device/dto/DeviceTechnicalAgreemntQueryDTO.java | 2 +-
platformx-device-biz/src/main/resources/mapper/DeviceTechnicalAgreementMapper.xml | 4 ++--
platformx-device-biz/src/main/resources/mapper/InventoryFlowWaterMapper.xml | 6 ++++++
platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/InventoryFlowWaterQueryDTO.java | 6 ++++++
4 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/DeviceTechnicalAgreemntQueryDTO.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/DeviceTechnicalAgreemntQueryDTO.java
index 265c127..98a1206 100644
--- a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/DeviceTechnicalAgreemntQueryDTO.java
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/DeviceTechnicalAgreemntQueryDTO.java
@@ -5,7 +5,7 @@
@Data
public class DeviceTechnicalAgreemntQueryDTO {
- private String contractName;
+ private String agreementName;
private String deviceName;
}
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/InventoryFlowWaterQueryDTO.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/InventoryFlowWaterQueryDTO.java
index 0fb330c..9dc1579 100644
--- a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/InventoryFlowWaterQueryDTO.java
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/InventoryFlowWaterQueryDTO.java
@@ -10,4 +10,10 @@
@Schema(description = "璁惧鍚嶇О")
private String deviceName;
+ @Schema(description = "璁惧搴忓垪鍙�")
+ private String serialNo;
+
+ @Schema(description = "璁惧鍒嗙被")
+ private String className;
+
}
diff --git a/platformx-device-biz/src/main/resources/mapper/DeviceTechnicalAgreementMapper.xml b/platformx-device-biz/src/main/resources/mapper/DeviceTechnicalAgreementMapper.xml
index bd7e9db..1092176 100644
--- a/platformx-device-biz/src/main/resources/mapper/DeviceTechnicalAgreementMapper.xml
+++ b/platformx-device-biz/src/main/resources/mapper/DeviceTechnicalAgreementMapper.xml
@@ -41,8 +41,8 @@
join device d on d.id = dta.device_id
where
dta.del_flag = '0'
- <if test="queryDTO.contractName != null and queryDTO.contractName !=''">
- and c.name like CONCAT('%', #{queryDTO.contractName}, '%')
+ <if test="queryDTO.agreementName != null and queryDTO.agreementName !=''">
+ and dta.agreement_name like CONCAT('%', #{queryDTO.agreementName}, '%')
</if>
<if test="queryDTO.deviceName != null and queryDTO.deviceName !=''">
and d.name like CONCAT('%', #{queryDTO.deviceName}, '%')
diff --git a/platformx-device-biz/src/main/resources/mapper/InventoryFlowWaterMapper.xml b/platformx-device-biz/src/main/resources/mapper/InventoryFlowWaterMapper.xml
index a2d92d1..bf5c814 100644
--- a/platformx-device-biz/src/main/resources/mapper/InventoryFlowWaterMapper.xml
+++ b/platformx-device-biz/src/main/resources/mapper/InventoryFlowWaterMapper.xml
@@ -36,6 +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