diff --git a/apps/enm/tasks.py b/apps/enm/tasks.py index ace63c40..29a8cf5d 100644 --- a/apps/enm/tasks.py +++ b/apps/enm/tasks.py @@ -272,19 +272,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["sum"] + ms_day_s.val = sum_dict_day_s.get('sum', 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["sum"] + ms_month_s.val = sum_dict_month_s.get('sum', 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["sum"] + ms_year_s.val = sum_dict_year_s.get('sum', 0) ms_year_s.save() if next_cal: # 计算工段级数据,手动录入时调用