added associated equipment data to CombinedEquipmentEnergyItem report & excel reporter

pull/23/head
Caozhenhui 2021-03-25 17:10:37 +08:00
parent ca4fdc0872
commit 3ccce287ee
1 changed files with 2 additions and 2 deletions

View File

@ -474,8 +474,8 @@ class Reporting:
associated_equipment['name'])
cursor_energy.execute(" SELECT SUM(actual_value) "
" FROM tbl_combined_equipment_input_item_hourly "
" WHERE combined_equipment_id = %s "
" FROM tbl_equipment_input_item_hourly "
" WHERE equipment_id = %s "
" AND energy_item_id = %s "
" AND start_datetime_utc >= %s "
" AND start_datetime_utc < %s "