首页统计

src/inspect_report/api/tasksapi.py

@@ -560,7 +560,10 @@ class TasksApi(viewsets.ViewSet):
         task_condition = {'create_date__gte': q_start_date, 'create_date__lt': q_end_date}
         if task_id:
             task_condition['task'] = task_id
-        tasks = RulesStat.objects.filter(**task_condition).values('rule', 'sessionCollectionId', 'rule_num')
+        # tasks = RulesStat.objects.filter(**task_condition).values('rule', 'sessionCollectionId', 'rule_num')
+        tasks = RulesStat.objects.all().filter(**task_condition)\
+            .extra(select={'rule': "rule", 'sessionCollectionId': 'sessionCollectionId'})\
+            .values('rule','sessionCollectionId').annotate(rule_num=Count('id')).order_by('-rule_num')
         for t in tasks:
             name = t['rule']
             if name in return_data.keys():