From 75f043dfa6660716364e66ee0b3cf99f44255686 Mon Sep 17 00:00:00 2001
From: DYL0109 <dn18191638832@163.com>
Date: 星期三, 16 四月 2025 19:20:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into dyl_dev
---
zhitan-system/src/main/resources/mapper/keyequipment/MonthlyKeyEquipmentMapper.xml | 43 +++++++++++++++++++++++++------------------
1 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/zhitan-system/src/main/resources/mapper/keyequipment/MonthlyKeyEquipmentMapper.xml b/zhitan-system/src/main/resources/mapper/keyequipment/MonthlyKeyEquipmentMapper.xml
index 19f8a86..d279c75 100644
--- a/zhitan-system/src/main/resources/mapper/keyequipment/MonthlyKeyEquipmentMapper.xml
+++ b/zhitan-system/src/main/resources/mapper/keyequipment/MonthlyKeyEquipmentMapper.xml
@@ -46,32 +46,39 @@
SELECT
aa.index_id,
aa.index_name,
+ aa.unit_id,
<foreach item="item" index="index" collection="dataList">
MAX ( CASE WHEN data_time = #{item.dataTime} THEN "value" END ) AS ${item.value},
</foreach>
aa.time_type
FROM
(
- SELECT
- ci.index_id,
- ci.NAME AS "index_name",
- di."value",
- di.data_time,
- di.time_type
- FROM
- data_item di LEFT JOIN energy_index ci ON di.index_id = ci.index_id
- LEFT JOIN facility_archives f ON f."id"=ci.equipment
- WHERE
- di.data_time >= #{beginTime}
- AND di.data_time < #{endTime}
- AND di.index_id IN <foreach item="indexId" index="index" collection="indexIds" open="(" separator="," close=")">#{indexId} </foreach>
- AND di.time_type = #{timeType}
- <if test="indexStorageId !='' and indexStorageId !=null">
- and ci.equipment=#{indexStorageId}
- </if>
+ SELECT
+ ni.index_id,
+ ei.NAME AS "index_name",
+ ei.unit_id,
+ di."value",
+ di.data_time,
+ di.time_type
+ FROM
+ model_node mn
+ LEFT JOIN node_index ni ON ni.node_id = mn.node_id
+ LEFT JOIN energy_index ei ON ei.index_id = ni.index_id
+ LEFT JOIN data_item di ON ni.index_id = di.index_id
+ WHERE
+ di.data_time >= #{beginTime}
+ AND di.data_time < #{endTime}
+ AND di.index_id IN
+ <foreach item="indexId" index="index" collection="indexIds" open="(" separator="," close=")">
+ #{indexId}
+ </foreach>
+ AND di.time_type = #{timeType}
+ <if test="indexStorageId !='' and indexStorageId !=null">
+ and ei.energy_id=#{indexStorageId}
+ </if>
) aa
GROUP BY
- aa.index_id,aa.index_name,aa.time_type
+ aa.index_id, aa.index_name, aa.unit_id, aa.time_type
</select>
<select id="getListChart" resultMap="dataItemMap">
--
Gitblit v1.9.3