From 78484feacbdc86a09560c7939a6158eb908c674c Mon Sep 17 00:00:00 2001
From: VVT789 <sdxt_0802@163.com>
Date: 星期一, 17 三月 2025 18:20:15 +0800
Subject: [PATCH] fix bug
---
zhitan-system/src/main/resources/mapper/model/EnergyIndexMapper.xml | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/zhitan-system/src/main/resources/mapper/model/EnergyIndexMapper.xml b/zhitan-system/src/main/resources/mapper/model/EnergyIndexMapper.xml
index 3ea43ac..279d42f 100644
--- a/zhitan-system/src/main/resources/mapper/model/EnergyIndexMapper.xml
+++ b/zhitan-system/src/main/resources/mapper/model/EnergyIndexMapper.xml
@@ -303,11 +303,11 @@
from energy_index
where meter_id = #{meterId}
</delete>
- <delete id="removeNodeIndex">
- delete from node_index where node_id = #{nodeId} and index_id in
- <foreach item="indexId" collection="indexIds" open="(" separator="," close=")">
+ <delete id="removeEnergyIndex">
+ delete from energy_index where index_id in
+ <foreach collection="indexIds" item="indexId" open="(" separator="," close=")">
#{indexId}
- </foreach>;
+ </foreach>
</delete>
<select id="getEnergyIndexMeterByCodes" resultMap="EnergyIndexResult">
@@ -391,4 +391,21 @@
</if>
</where>
</select>
+ <select id="getIndexByMeterIdIndexCode" resultType="com.zhitan.model.domain.EnergyIndex">
+ SELECT ei.code,mi.meter_name||'_'||ei.name as name from energy_index ei
+ LEFT JOIN node_device nd on ei.meter_id = nd.device_id
+ LEFT JOIN meter_implement mi on mi."id" = nd.device_id
+ <where>
+ <if test="nodeId != null and nodeId != ''">and nd.node_id = #{nodeId}</if>
+ <if test="indexCode != null and indexCode != ''">
+ and (mi.meter_name like concat('%', #{indexCode}, '%')
+ or ei.code like concat('%', #{indexCode}, '%')
+ or ei.name like concat('%', #{indexCode}, '%')
+ )
+ </if>
+ <if test="meterId != null and meterId != ''">
+ and ei.meter_id = #{meterId}
+ </if>
+ </where>
+ </select>
</mapper>
--
Gitblit v1.9.3