From cdfa35851d45dfda4d0884babdd00310234f870a Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 21 May 2024 11:34:23 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=AE=97=E6=80=BB=E7=85=A4=E8=80=97?= =?UTF-8?q?=E6=97=B6month=5Fs=E4=BB=A5day=5Fs=E7=9B=B8=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/enm/tasks.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/enm/tasks.py b/apps/enm/tasks.py index fa8712f5..a34f0616 100644 --- a/apps/enm/tasks.py +++ b/apps/enm/tasks.py @@ -536,9 +536,9 @@ def cal_enstat(type, sflogId, mgroupId, year, month, day, hour, year_s, month_s, sum=Sum("pcoal_coal_consume") )["sum"] elif type == "month_s": - enstat.pcoal_coal_consume = EnStat.objects.filter(type="sflog", mgroup=enstat.mgroup, year_s=year_s, month_s=month_s).aggregate(sum=Sum("pcoal_coal_consume"))["sum"] + enstat.pcoal_coal_consume = EnStat.objects.filter(type="day_s", mgroup=enstat.mgroup, year_s=year_s, month_s=month_s).aggregate(sum=Sum("pcoal_coal_consume"))["sum"] elif type == "year_s": - enstat.pcoal_coal_consume = EnStat.objects.filter(type="sflog", mgroup=enstat.mgroup, year_s=year_s).aggregate(sum=Sum("pcoal_coal_consume"))["sum"] + enstat.pcoal_coal_consume = EnStat.objects.filter(type="month_s", mgroup=enstat.mgroup, year_s=year_s).aggregate(sum=Sum("pcoal_coal_consume"))["sum"] if enstat.pcoal_coal_consume is None: enstat.pcoal_coal_consume = 0