违规项统计

src/inspect_report/api/tasksapi.py

@@ -93,7 +93,10 @@ class TasksApi(viewsets.ViewSet):
             task_condition['task'] = task_id
         if agent_name:
             task_condition['agentName'] = agent_name
-        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():
@@ -106,7 +109,7 @@ class TasksApi(viewsets.ViewSet):
         for k, v in return_data.items():
             v['rule'] = k
             data_sort.append(v)
-        data_sort = sorted(data_sort, key=lambda x: x['count'], reverse=True)
+        # data_sort = sorted(data_sort, key=lambda x: x['count'], reverse=True)
         return Response({'code': 0, 'msg': 'success', 'data': data_sort})
 
     @action(['post'], detail=False)
@@ -563,7 +566,7 @@ class TasksApi(viewsets.ViewSet):
         # 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')
+            .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():
@@ -578,7 +581,7 @@ class TasksApi(viewsets.ViewSet):
             v['ratio'] = round(v['count']/call_count, 2) if call_count else 0
             v['call_count'] = call_count
             data_sort.append(v)
-        data_sort = sorted(data_sort, key=lambda x: x['count'], reverse=True)
+        # data_sort = sorted(data_sort, key=lambda x: x['count'], reverse=True)
         return Response({'code': 0, 'msg': 'success', 'data': data_sort})
 
     @action(['post'], detail=False)