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/dailyprocessenergy/YearProcessEnergyMapper.xml | 55 +++++++++++++++++++++++++++++++------------------------
1 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/zhitan-system/src/main/resources/mapper/dailyprocessenergy/YearProcessEnergyMapper.xml b/zhitan-system/src/main/resources/mapper/dailyprocessenergy/YearProcessEnergyMapper.xml
index d94512b..f8a72a3 100644
--- a/zhitan-system/src/main/resources/mapper/dailyprocessenergy/YearProcessEnergyMapper.xml
+++ b/zhitan-system/src/main/resources/mapper/dailyprocessenergy/YearProcessEnergyMapper.xml
@@ -25,34 +25,41 @@
<select id="getYearProcessEnergy" resultMap="dataItemMap">
SELECT
- aa.index_id,
- aa.index_name,
- <foreach item="item" index="index" collection="dataList">
- MAX ( CASE WHEN data_time = #{item.dateTime} THEN "value" END ) AS ${item.value},
- </foreach>
- aa.time_type
+ aa.index_id,
+ aa.index_name,
+ aa.unit_id,
+ <foreach item="item" index="index" collection="dataList">
+ MAX ( CASE WHEN data_time = #{item.dateTime} 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