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

fix: 全厂电量计算bug

This commit is contained in:
caoqianming 2024-04-30 16:53:06 +08:00
parent cb766247b0
commit 59c000670a
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/enm/tasks.py
View File

@ -619,11 +619,9 @@ def cal_enstat2(type: str, year_s: int, month_s: int, day_s: int, cascade=True):
) )
if use_mpoint_elec_val: if use_mpoint_elec_val:
if type == 'day_s': if type == 'day_s':
typex = 'day' 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"))["sum"]
enstat2.elec_consume = MpointStat.objects.filter(type=typex, mpoint__in=mp_elecs, year=year_s, month=month_s, day=day_s).aggregate(sum=Sum("val"))["sum"]
elif type == 'month_s': elif type == 'month_s':
typex = 'month' enstat2.elec_consume = MpointStat.objects.filter(type=type, mpoint__in=mp_elecs, year_s=year_s, month_s=month_s).aggregate(sum=Sum("val"))["sum"]
enstat2.elec_consume = MpointStat.objects.filter(type=typex, mpoint__in=mp_elecs, year=year_s, month=month_s).aggregate(sum=Sum("val"))["sum"]
else: else:
enstat2.elec_consume = res_elec_pcoal["sum1"] if res_elec_pcoal["sum1"] else 0 enstat2.elec_consume = res_elec_pcoal["sum1"] if res_elec_pcoal["sum1"] else 0
enstat2.elec_coal_consume = enstat2.elec_consume * 0.1229 / 1000 enstat2.elec_coal_consume = enstat2.elec_consume * 0.1229 / 1000