diff --git a/apps/enm/tasks.py b/apps/enm/tasks.py index 0c3f2a9f..a64564cc 100644 --- a/apps/enm/tasks.py +++ b/apps/enm/tasks.py @@ -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 type == 'day_s': - typex = 'day' - 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"] + 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"] elif type == 'month_s': - typex = 'month' - enstat2.elec_consume = MpointStat.objects.filter(type=typex, mpoint__in=mp_elecs, year=year_s, month=month_s).aggregate(sum=Sum("val"))["sum"] + 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"] else: enstat2.elec_consume = res_elec_pcoal["sum1"] if res_elec_pcoal["sum1"] else 0 enstat2.elec_coal_consume = enstat2.elec_consume * 0.1229 / 1000