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