diff --git a/apps/enm/tasks.py b/apps/enm/tasks.py index 81f0f140..cf0da6d3 100644 --- a/apps/enm/tasks.py +++ b/apps/enm/tasks.py @@ -209,10 +209,11 @@ def cal_mpointstats(is_now=1, year=None, month=None, day=None, hour=None, m_code year, month, day, hour = pre.year, pre.month, pre.day, pre.hour if m_code_list: mpoints1 = Mpoint.objects.filter(code__in=m_code_list) - mpoints_related = Mpoint.objects.none() for item in mpoints1: cal_mpointstat_hour(item.id, year, month, day, hour) - mpoints_related = mpoints_related | Mpoint.objects.filter(type=Mpoint.MT_COMPUTE, enabled=True, material__isnull=False, formula__contains='{' + item.code + '}') + mpoints_related = Mpoint.objects.none() + for code in m_code_list: + mpoints_related = mpoints_related | Mpoint.objects.filter(type=Mpoint.MT_COMPUTE, enabled=True, material__isnull=False, formula__contains='{' + code + '}') mpoints_related = mpoints_related.order_by('report_sortstr', 'create_time') for item in mpoints_related: cal_mpointstat_hour(item.id, year, month, day, hour)