From c5905e842537b535ef4e3f64ae63bef9f8833d15 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 27 Mar 2020 10:32:10 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=83=E4=B9=A0=E5=8A=A0=E8=BD=BD=E9=A2=98?= =?UTF-8?q?=E7=9B=AE=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test_server/question/views.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/test_server/question/views.py b/test_server/question/views.py index dd28d1b..358f9de 100644 --- a/test_server/question/views.py +++ b/test_server/question/views.py @@ -269,16 +269,13 @@ class ExerciseView(APIView): permission_classes = [] def post(self, request): questioncat = request.data['questioncat'] - queryset = Question.objects.filter(is_delete=0,questioncat=questioncat) + queryset = Question.objects.filter(is_delete=0,questioncat=questioncat).order_by('id') if 'ydtms' in request.data and request.data['ydtms']: queryset = queryset.exclude(id__in = request.data['ydtms']) - total = queryset.count() - queryset = queryset.order_by('id')[0:10] - # pg = CommonPagination() - # p = pg.paginate_queryset(queryset=queryset,request=request,view=self) - # serializer = QuestionSerializer(instance=p,many=True) - # return pg.get_paginated_response(serializer.data) - serializer = QuestionSerializer(instance=queryset,many=True) + count = queryset.count() + pg = CommonPagination() + p = pg.paginate_queryset(queryset=queryset,request=request,view=self) + serializer = QuestionSerializer(instance=p,many=True) collects = request.user.collects.all().values_list('id',flat=True) #当前用户收藏的题目 results = serializer.data for i in results: @@ -286,4 +283,4 @@ class ExerciseView(APIView): i['is_collect'] = True else: i['is_collect'] = False - return Response({'total':total, 'results':results}) \ No newline at end of file + return Response({'count':count, 'results':results}) \ No newline at end of file