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/MonthlyComprehensiveMapper.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/zhitan-system/src/main/resources/mapper/comprehensivestatistics/MonthlyComprehensiveMapper.xml b/zhitan-system/src/main/resources/mapper/comprehensivestatistics/MonthlyComprehensiveMapper.xml
index 7de48b9..93c68d9 100644
--- a/zhitan-system/src/main/resources/mapper/comprehensivestatistics/MonthlyComprehensiveMapper.xml
+++ b/zhitan-system/src/main/resources/mapper/comprehensivestatistics/MonthlyComprehensiveMapper.xml
@@ -46,6 +46,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>
@@ -56,6 +57,7 @@
SELECT
ni.index_id,
ei."name" AS "index_name",
+ ei.unit_id,
di."value",
di.data_time,
di.time_type,
@@ -75,7 +77,7 @@
</if>
) aa
GROUP BY
- aa.index_id, aa.index_name, aa.time_type, aa.order_num
+ aa.index_id, aa.index_name, aa.unit_id, aa.time_type, aa.order_num
ORDER BY aa.order_num ASC
</select>
--
Gitblit v1.9.3