From 89d9ac84d80fbcc3c20311d81605229c87a97326 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 13 May 2024 16:30:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20['sum']=E6=97=B6=E8=A6=81=E6=B3=A8?=
 =?UTF-8?q?=E6=84=8Fnone=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/enm/tasks.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/enm/tasks.py b/apps/enm/tasks.py
index 2d7ec73d..c646794f 100644
--- a/apps/enm/tasks.py
+++ b/apps/enm/tasks.py
@@ -139,21 +139,21 @@ def cal_mpointstat_hour(mpointId: str, year: int, month: int, day: int, hour: in
             sum_dict_day = MpointStat.objects.filter(type="hour", mpoint=mpoint, year=year, month=month, day=day).aggregate(sum=Sum("val"))
             params_day = {"type": "day", "mpoint": mpoint, "year": year, "month": month, "day": day}
             ms_day, _ = MpointStat.objects.get_or_create(**params_day, defaults=params_day)
-            ms_day.val = sum_dict_day.get('sum', 0)
+            ms_day.val = sum_dict_day['sum'] if sum_dict_day['sum'] is not None else 0
             ms_day.save()
 
         if cascade or day in [28, 29, 30, 31]:
             sum_dict_month = MpointStat.objects.filter(type="day", mpoint=mpoint, year=year, month=month).aggregate(sum=Sum("val"))
             params_month = {"type": "month", "mpoint": mpoint, "year": year, "month": month}
             ms_month, _ = MpointStat.objects.get_or_create(**params_month, defaults=params_month)
-            ms_month.val = sum_dict_month.get('sum', 0)
+            ms_month.val = sum_dict_month['sum'] if sum_dict_month['sum'] is not None else 0
             ms_month.save()
 
         if cascade or month == 12:
             sum_dict_year = MpointStat.objects.filter(type="month", mpoint=mpoint, year=year).aggregate(sum=Sum("val"))
             params_year = {"type": "year", "mpoint": mpoint, "year": year}
             ms_year, _ = MpointStat.objects.get_or_create(**params_year, defaults=params_year)
-            ms_year.val = sum_dict_year.get('sum', 0)
+            ms_year.val = sum_dict_year['sum'] if sum_dict_year['sum'] is not None else 0
             ms_year.save()
 
         mgroup = mpoint.mgroup
@@ -184,7 +184,7 @@ def cal_mpointstat_hour(mpointId: str, year: int, month: int, day: int, hour: in
                 sum_dict_sflog_s = MpointStat.objects.filter(type="hour_s", mpoint=mpoint, year_s=year_s, month_s=month_s, day_s=day_s, sflog=sflog).aggregate(sum=Sum("val"))
                 params_sflog_s = {"type": "sflog", "mpoint": mpoint, "sflog": sflog, "year_s": year_s, "month_s": month_s, "day_s": day_s, "mgroup": mgroup}
                 ms_sflog_s, _ = MpointStat.objects.get_or_create(**params_sflog_s, defaults=params_sflog_s)
-                ms_sflog_s.val = sum_dict_sflog_s.get('sum', 0)
+                ms_sflog_s.val = sum_dict_sflog_s['sum'] if sum_dict_sflog_s['sum'] is not None else 0
                 ms_sflog_s.save()
 
                 # next_cal_dict = [mpoint.material.id, sflog.id, year, month, day, hour, year_s, month_s, day_s]
@@ -275,19 +275,19 @@ def cal_mpointstat_manual(mpointId: str, sflogId: str, mgroupId: str, year: int,
     sum_dict_day_s = MpointStat.objects.filter(type="sflog", mpoint=mpoint, year_s=year_s, month_s=month_s, day_s=day_s, mgroup=mgroup).aggregate(sum=Sum("val"))
     params_day_s = {"type": "day_s", "mpoint": mpoint, "year_s": year_s, "month_s": month_s, "day_s": day_s, "mgroup": mgroup}
     ms_day_s, _ = MpointStat.objects.get_or_create(**params_day_s, defaults=params_day_s)
-    ms_day_s.val = sum_dict_day_s.get('sum', 0)
+    ms_day_s.val = sum_dict_day_s['sum'] if sum_dict_day_s['sum'] is not None else 0
     ms_day_s.save()
 
     sum_dict_month_s = MpointStat.objects.filter(type="day_s", mpoint=mpoint, year_s=year_s, month_s=month_s, mgroup=mgroup).aggregate(sum=Sum("val"))
     params_month_s = {"type": "month_s", "mpoint": mpoint, "year_s": year_s, "month_s": month_s, "mgroup": mgroup}
     ms_month_s, _ = MpointStat.objects.get_or_create(**params_month_s, defaults=params_month_s)
-    ms_month_s.val = sum_dict_month_s.get('sum', 0)
+    ms_month_s.val = sum_dict_month_s['sum'] if sum_dict_month_s['sum'] is not None else 0
     ms_month_s.save()
 
     sum_dict_year_s = MpointStat.objects.filter(type="month_s", mpoint=mpoint, year_s=year_s, mgroup=mgroup).aggregate(sum=Sum("val"))
     params_year_s = {"type": "year_s", "mpoint": mpoint, "year_s": year_s, "mgroup": mgroup}
     ms_year_s, _ = MpointStat.objects.get_or_create(**params_year_s, defaults=params_year_s)
-    ms_year_s.val = sum_dict_year_s.get('sum', 0)
+    ms_year_s.val = sum_dict_year_s['sum'] if sum_dict_year_s['sum'] is not None else 0
     ms_year_s.save()
 
     if next_cal:  # 计算工段级数据,手动录入时调用