From 0459b27e14d139b2facb4acdf3ba9e73f362fe7a Mon Sep 17 00:00:00 2001 From: hupeng Date: Mon, 29 Jul 2019 12:19:40 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=94=B5=E8=A1=A8][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=94=B5=E8=A1=A8group=20by=E7=9A=84?= =?UTF-8?q?=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/KwMerchantMeterMapper.xml | 2 +- .../resources/mapper/KwMeterDataMapper.xml | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml b/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml index 297574baa..9094bebd0 100644 --- a/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml @@ -243,7 +243,7 @@ sum(used_power) as usedPower FROM kw_meter_data - group by meter_id + group by tenant_id,box_id,meter_id ) as temp, wx_merchant m where mm.status = 0 diff --git a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml index 9e0b3ee92..1ceb4d0b4 100644 --- a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml @@ -88,8 +88,10 @@ ) temp where create_time = temp.maxTime - and meter_id = temp.maxMeterId - group by `meter_id` + + and meter_id = temp.maxMeterId + + @@ -181,7 +183,7 @@ sum(used_power) as usedPower FROM kw_meter_data - group by reportTime,meter_id + group by reportTime,meter_id,box_id ) as temp join kw_meter on id = temp.meter_id and `status` = #{status} @@ -223,7 +225,13 @@ sum(used_power) as usedPower, - tenant_id,box_id,meter_id + + meter_id, + + + box_id, + + tenant_id FROM kw_meter_data where 1 = 1 @@ -267,6 +275,9 @@ group by reportTime + + ,box_id + ,meter_id