zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

event cate agg增加trigger

This commit is contained in:
曹前明 2022-07-13 09:42:22 +08:00
parent afe0c171cf
commit c7b808f106
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/ecm/views.py
View File

@ -120,12 +120,13 @@ class EventViewSet(ListModelMixin, RetrieveModelMixin, CustomGenericViewSet):
queryset = queryset.filter(event__handle_user=None) queryset = queryset.filter(event__handle_user=None)
ret['total_count'] = queryset.count() ret['total_count'] = queryset.count()
if vdata.get('completed', True): 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']: for i in ret['details']:
i['count'] = queryset.filter(cate__id=i['cate']).count() i['count'] = queryset.filter(cate__id=i['cate']).count()
else: else:
ret['details'] = list(queryset.order_by('-cate__priority', 'cate__create_time').values( 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) return Response(ret)