Przeglądaj źródła

[电表][修复]:调整电表group by的语句

release_toaliyun_real
hupeng 6 lat temu
rodzic
commit
0459b27e14
2 zmienionych plików z 16 dodań i 5 usunięć
  1. +1
    -1
      mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml
  2. +15
    -4
      mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml

+ 1
- 1
mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml Wyświetl plik

@@ -243,7 +243,7 @@
sum(used_power) as usedPower sum(used_power) as usedPower
FROM kw_meter_data FROM kw_meter_data
<include refid="dynamicWhereConditionsVo"/> <include refid="dynamicWhereConditionsVo"/>
group by meter_id
group by tenant_id,box_id,meter_id
) as temp, ) as temp,
wx_merchant m wx_merchant m
where mm.status = 0 where mm.status = 0


+ 15
- 4
mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml Wyświetl plik

@@ -88,8 +88,10 @@
) temp ) temp
where where
create_time = temp.maxTime create_time = temp.maxTime
and meter_id = temp.maxMeterId
group by `meter_id`
<if test=" null != meterId ">
and meter_id = temp.maxMeterId
</if>

</select> </select>




@@ -181,7 +183,7 @@
sum(used_power) as usedPower sum(used_power) as usedPower
FROM kw_meter_data FROM kw_meter_data
<include refid="dynamicWhereConditionsVo"/> <include refid="dynamicWhereConditionsVo"/>
group by reportTime,meter_id
group by reportTime,meter_id,box_id
) as temp join kw_meter on id = temp.meter_id ) as temp join kw_meter on id = temp.meter_id
<if test=" null != status "> <if test=" null != status ">
and `status` = #{status} and `status` = #{status}
@@ -223,7 +225,13 @@
<if test=" null != endTime and null != endTime"> <if test=" null != endTime and null != endTime">
sum(used_power) as usedPower, sum(used_power) as usedPower,
</if> </if>
tenant_id,box_id,meter_id
<if test=" null != meterId ">
meter_id,
</if>
<if test=" null != boxId ">
box_id,
</if>
tenant_id
FROM kw_meter_data FROM kw_meter_data
where 1 = 1 where 1 = 1
<if test=" null != tenantId "> <if test=" null != tenantId ">
@@ -267,6 +275,9 @@
</if> </if>


group by reportTime group by reportTime
<if test=" null != boxId ">
,box_id
</if>
<if test=" null != meterId "> <if test=" null != meterId ">
,meter_id ,meter_id
</if> </if>


Ładowanie…
Anuluj
Zapisz