seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed NoneType error in CombinedEquipmentLoad report in API

pull/23/head
13621160019@163.com 2021-03-23 16:01:44 +08:00
parent 1448c17749
commit 7a86423068
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
myems-api/reports/combinedequipmentload.py
View File

@ -507,19 +507,22 @@ class Reporting:
result['reporting_period']['averages'].append(reporting[energy_category_id]['average'])
result['reporting_period']['averages_increment_rate'].append(
(reporting[energy_category_id]['average'] - base[energy_category_id]['average']) /
base[energy_category_id]['average'] if (base[energy_category_id]['average'] is not None and
base[energy_category_id]['average'] if (reporting[energy_category_id]['average'] is not None and
base[energy_category_id]['average'] is not None and
base[energy_category_id]['average'] > Decimal(0.0))
else None)
result['reporting_period']['maximums'].append(reporting[energy_category_id]['maximum'])
result['reporting_period']['maximums_increment_rate'].append(
(reporting[energy_category_id]['maximum'] - base[energy_category_id]['maximum']) /
base[energy_category_id]['maximum'] if (base[energy_category_id]['maximum'] is not None and
base[energy_category_id]['maximum'] if (reporting[energy_category_id]['maximum'] is not None and
base[energy_category_id]['maximum'] is not None and
base[energy_category_id]['maximum'] > Decimal(0.0))
else None)
result['reporting_period']['factors'].append(reporting[energy_category_id]['factor'])
result['reporting_period']['factors_increment_rate'].append(
(reporting[energy_category_id]['factor'] - base[energy_category_id]['factor']) /
base[energy_category_id]['factor'] if (base[energy_category_id]['factor'] is not None and
base[energy_category_id]['factor'] if (reporting[energy_category_id]['factor'] is not None and
base[energy_category_id]['factor'] is not None and
base[energy_category_id]['factor'] > Decimal(0.0))
else None)