From 28dc7dc6eab44e3988886e9b0304c95d1ffb281d Mon Sep 17 00:00:00 2001
From: zt916916 <1903964620@qq.com>
Date: 星期四, 20 三月 2025 17:51:58 +0800
Subject: [PATCH] 重点设备能耗年优化

---
 zhitan-system/src/main/resources/mapper/keyequipment/YearKeyEquipmentMapper.xml |   39 +++++++++++++++++++++++----------------
 1 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/zhitan-system/src/main/resources/mapper/keyequipment/YearKeyEquipmentMapper.xml b/zhitan-system/src/main/resources/mapper/keyequipment/YearKeyEquipmentMapper.xml
index 6a2316e..3d4e35e 100644
--- a/zhitan-system/src/main/resources/mapper/keyequipment/YearKeyEquipmentMapper.xml
+++ b/zhitan-system/src/main/resources/mapper/keyequipment/YearKeyEquipmentMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhitan.keyequipment.mapper.YearKeyEquipmentMapper">
     <resultMap id="dataItemMap" type="com.zhitan.keyequipment.domain.YearKeyEquipment">
         <result column="index_id" property="indexId"/>
@@ -28,14 +28,14 @@
         aa.index_id,
         aa.index_name,
         <foreach item="item" index="index" collection="dataList">
-            MAX ( CASE WHEN data_time = #{item.dataTime} THEN "value" END ) AS ${item.value},
+            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",
+        ci.NAME AS "index_name",
         di."value",
         di.data_time,
         di.time_type
@@ -43,9 +43,12 @@
         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}
+        di.data_time &gt;= #{beginTime}
         AND di.data_time &lt; #{endTime}
-        AND di.index_id IN <foreach item="indexId" index="index" collection="indexIds"  open="(" separator="," close=")">#{indexId} </foreach>
+        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}
@@ -57,20 +60,24 @@
 
     <select id="getListChart" resultMap="dataItemMap">
         SELECT
-            di.index_id,
-            ci.name AS "index_name",
-            ci.unit_id,
-            di."value",
-            di.data_time,
-            di.time_type,
-            di.time_code
+        di.index_id,
+        ci.name AS "index_name",
+        ci.unit_id,
+        di."value",
+        di.data_time,
+        di.time_type,
+        di.time_code
         FROM
         data_item di LEFT JOIN energy_index ci ON di.index_id = ci.index_id
         WHERE
-            di.index_id =#{indexId}
-            AND di.data_time &lt; #{endTime}
-            AND di.data_time >= #{beginTime}
+        di.index_id =#{indexId}
+        AND di.data_time &lt; #{endTime}
+        <if test="endTime != null">
+            AND di.data_time &gt;= #{beginTime}
+        </if>
+        <if test="beginTime != null">
             AND di.time_type = #{timeType}
+        </if>
         order by di.data_time
     </select>
 </mapper>

--
Gitblit v1.9.3