From ca39f9dd34b5a578c7a4ff170cb39d42cbc77234 Mon Sep 17 00:00:00 2001 From: 潘晓明 <hahagongzi2006@163.com> Date: 星期四, 13 二月 2025 11:50:51 +0800 Subject: [PATCH] 成本趋势分析页面接口:不传能源类型时,取所有能源类型。 --- zhitan-system/src/main/resources/mapper/peakvalley/ElectricityDataItemMapper.xml | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zhitan-system/src/main/resources/mapper/peakvalley/ElectricityDataItemMapper.xml b/zhitan-system/src/main/resources/mapper/peakvalley/ElectricityDataItemMapper.xml index 449019b..d478107 100644 --- a/zhitan-system/src/main/resources/mapper/peakvalley/ElectricityDataItemMapper.xml +++ b/zhitan-system/src/main/resources/mapper/peakvalley/ElectricityDataItemMapper.xml @@ -65,12 +65,12 @@ "electricity_data_item" di JOIN energy_index ei ON di.index_id = ei.index_id WHERE - di.index_id IN ( SELECT index_id FROM node_index WHERE node_id = #{indexId}) - <if test="emissionType !='' and emissionType !=null and emissionType =='allType'"> + di.index_id IN ( SELECT index_id FROM node_index WHERE node_id = #{nodeId}) + <if test="energyType !='' and energyType !=null and energyType =='allType'"> AND ei.energy_id != '' </if> - <if test="emissionType !='' and emissionType !=null and emissionType !='allType'"> - AND ei.energy_id = #{emissionType} + <if test="energyType !='' and energyType !=null and energyType !='allType'"> + AND ei.energy_id = #{energyType} </if> AND (di.data_time BETWEEN #{beginTime} AND #{endTime}) AND di.time_type = #{timeType} -- Gitblit v1.9.3