From 75f9894ebac12b13c7ead27c3e16db833ee9251a Mon Sep 17 00:00:00 2001
From: z1415143022 <z1415143022@163.com>
Date: 星期二, 25 三月 2025 20:02:45 +0800
Subject: [PATCH] Merge branch 'develop1.0' into zhangjw_from_develop1.0
---
zhitan-system/src/main/resources/mapper/model/EnergyIndexMapper.xml | 27 +++++++++++++++++++++++----
1 files changed, 23 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 78d0144..3e16008 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">
@@ -408,4 +408,23 @@
</if>
</where>
</select>
+ <select id="getModelNodeIndexInfoListByIndexIds"
+ resultType="com.zhitan.model.domain.vo.ModelNodeIndexInfo">
+ SELECT mi.model_name modelName,
+ mi.model_code,
+ mn."name" "name",
+ ei.index_id,
+ ei.code indexCode,
+ ei."name" indexName,
+ ei.energy_id,
+ ei.energy_id
+ FROM node_index ni
+ INNER JOIN energy_index ei ON ni.index_id = ei.index_id
+ LEFT JOIN model_node mn ON ni.node_id = mn.node_id
+ LEFT JOIN model_info mi ON mn.model_code = mi.model_code
+ WHERE ei.index_id IN
+ <foreach collection="indexIds" item="indexId" open="(" separator="," close=")">
+ #{indexId}
+ </foreach>
+ </select>
</mapper>
--
Gitblit v1.9.3