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

fixed NoneType issue in SpaceEfficiency Report API

pull/24/head
13621160019@163.com 2021-03-23 15:20:32 +08:00
parent 58cc086cc6
commit f38d7e3691
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
myems-api/reports/spaceefficiency.py
View File

@ -652,7 +652,7 @@ class Reporting:
(reporting_input[energy_category_id]['subtotal'] -
base_input[energy_category_id]['subtotal']) /
base_input[energy_category_id]['subtotal']
if base_input[energy_category_id]['subtotal'] > 0.0 else None)
if base_input[energy_category_id]['subtotal'] > Decimal(0.0) else None)
result['reporting_period_output'] = dict()
result['reporting_period_output']['names'] = list()
@ -717,7 +717,10 @@ class Reporting:
result['reporting_period_efficiency']['cumulations'].append(reporting_cumulation)
result['reporting_period_efficiency']['increment_rates'].append(
((reporting_cumulation - base_cumulation) / base_cumulation if (base_cumulation > Decimal(0.0))
((reporting_cumulation - base_cumulation) / base_cumulation
if (reporting_cumulation is not None and
base_cumulation is not None and
base_cumulation > Decimal(0.0))
else None)
)