From b0765ec5be45d6db1993064d5261bf42e94d161f Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 12 八月 2025 16:38:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into pim_yys
---
src/main/resources/mapper/equipmentenergyconsumption/EquipmentEnergyConsumptionMapper.xml | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/equipmentenergyconsumption/EquipmentEnergyConsumptionMapper.xml b/src/main/resources/mapper/equipmentenergyconsumption/EquipmentEnergyConsumptionMapper.xml
index 18a5700..eda1827 100644
--- a/src/main/resources/mapper/equipmentenergyconsumption/EquipmentEnergyConsumptionMapper.xml
+++ b/src/main/resources/mapper/equipmentenergyconsumption/EquipmentEnergyConsumptionMapper.xml
@@ -17,6 +17,9 @@
equipment_energy_consumption
WHERE
run_date = DATE_SUB(CURRENT_DATE(), INTERVAL 1 DAY)
+ <if test="req.name != null and req.name != ''">
+ and `name` like concat('%',#{req.name},'%')
+ </if>
GROUP BY
`code`
ORDER BY
--
Gitblit v1.9.3