zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 全厂电量计算enstat2.elec_consume拿不到默认0,2

This commit is contained in:
caoqianming 2024-04-30 17:49:53 +08:00
parent 94c34480ec
commit a7d03321d8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/enm/tasks.py
View File

@ -619,9 +619,9 @@ def cal_enstat2(type: str, year_s: int, month_s: int, day_s: int, cascade=True):
)
if use_mpoint_elec_val:
if type == 'day_s':
enstat2.elec_consume = MpointStat.objects.filter(type=type, mpoint__in=mp_elecs, year_s=year_s, month_s=month_s, day=day_s).aggregate(sum=Sum("val")).get('sum', 0)
enstat2.elec_consume = MpointStat.objects.filter(type='day', mpoint__in=mp_elecs, year=year_s, month=month_s, day=day_s).aggregate(sum=Sum("val")).get('sum', 0)
elif type == 'month_s':
enstat2.elec_consume = MpointStat.objects.filter(type=type, mpoint__in=mp_elecs, year_s=year_s, month_s=month_s).aggregate(sum=Sum("val")).get('sum', 0)
enstat2.elec_consume = MpointStat.objects.filter(type='month', mpoint__in=mp_elecs, year=year_s, month=month_s).aggregate(sum=Sum("val")).get('sum', 0)
else:
enstat2.elec_consume = res_elec_pcoal["sum1"] if res_elec_pcoal["sum1"] else 0