From c7b808f106dd245c6dc8104d33e8a5e0bf937b93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com> Date: Wed, 13 Jul 2022 09:42:22 +0800 Subject: [PATCH] =?UTF-8?q?event=20cate=20agg=E5=A2=9E=E5=8A=A0trigger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/ecm/views.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/ecm/views.py b/apps/ecm/views.py index 50d5725e..cd5b2154 100644 --- a/apps/ecm/views.py +++ b/apps/ecm/views.py @@ -120,12 +120,13 @@ class EventViewSet(ListModelMixin, RetrieveModelMixin, CustomGenericViewSet): queryset = queryset.filter(event__handle_user=None) ret['total_count'] = queryset.count() if vdata.get('completed', True): - ret['details'] = list(EventCate.objects.order_by('-priority', 'create_time').annotate(cate=F('id'), cate__name=F('name')).values('cate', 'cate__name')) + ret['details'] = list(EventCate.objects.order_by('-priority', 'create_time').annotate(cate=F('id'), + cate__name=F('name'), cate__trigger=F('trigger')).values('cate', 'cate__name')) for i in ret['details']: i['count'] = queryset.filter(cate__id=i['cate']).count() else: ret['details'] = list(queryset.order_by('-cate__priority', 'cate__create_time').values( - 'cate', 'cate__name').annotate(count=Count('cate'))) + 'cate', 'cate__name', 'cate__trigger').annotate(count=Count('cate'))) return Response(ret)