From cb317ade91a71a6c55f776f7a69c4cd87f4ea0fa Mon Sep 17 00:00:00 2001
From: VVT789 <sdxt_0802@163.com>
Date: 星期五, 21 三月 2025 15:44:59 +0800
Subject: [PATCH] 能耗统计,重点设备能耗,工序能耗优化

---
 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