diff --git a/apps/enm/tasks.py b/apps/enm/tasks.py index 37acd495..ace63c40 100644 --- a/apps/enm/tasks.py +++ b/apps/enm/tasks.py @@ -212,8 +212,13 @@ def cal_mpointstats(is_now=1, year=None, month=None, day=None, hour=None, m_code for item in mpoints1: cal_mpointstat_hour(item.id, year, month, day, hour) mpoints_related = Mpoint.objects.none() + code2 = [] 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 + '}') + code2.extend(mpoints_related.values_list('code', flat=True)) + code2 = list(set(code2)) + for code in code2: + mpoints_related = mpoints_related | Mpoint.objects.filter(type=Mpoint.MT_COMPUTE, enabled=True, material__isnull=False, formula__contains='{' + code + '}') mpoints_related = mpoints_related.distinct().order_by('report_sortstr', 'create_time') for item in mpoints_related: cal_mpointstat_hour(item.id, year, month, day, hour)