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/comprehensivestatistics/YearComprehensiveMapper.xml | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/zhitan-system/src/main/resources/mapper/comprehensivestatistics/YearComprehensiveMapper.xml b/zhitan-system/src/main/resources/mapper/comprehensivestatistics/YearComprehensiveMapper.xml
index e36e03c..7aabc8e 100644
--- a/zhitan-system/src/main/resources/mapper/comprehensivestatistics/YearComprehensiveMapper.xml
+++ b/zhitan-system/src/main/resources/mapper/comprehensivestatistics/YearComprehensiveMapper.xml
@@ -27,6 +27,7 @@
SELECT
aa.index_id,
aa.index_name,
+ aa.unit_id,
<foreach item="item" index="index" collection="dataList">
COALESCE ( MAX ( CASE WHEN data_time = #{item.dataTime} THEN "value" END ), null ) AS ${item.value},
</foreach>
@@ -37,6 +38,7 @@
SELECT
ni.index_id,
ei."name" AS "index_name",
+ ei.unit_id,
di."value",
di.data_time,
di.time_type,
@@ -51,12 +53,12 @@
AND di.data_time >= #{beginTime}
AND di.data_time <= #{endTime}
AND di.time_type = #{timeType}
- <if test="indexStorageId !='' and indexStorageId !=null">
- and ei.energy_id=#{indexStorageId}
- </if>
+ <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.order_num
- ORDER BY aa.order_num ASC
+ GROUP BY aa.index_id, aa.index_name, aa.unit_id, aa.time_type, aa.order_num
+ ORDER BY aa.order_num ASC
</select>
<select id="getListChart" resultMap="dataItemMap">
--
Gitblit v1.9.3