练习加载题目优化
This commit is contained in:
parent
014b339395
commit
c5905e8425
|
@ -269,16 +269,13 @@ class ExerciseView(APIView):
|
||||||
permission_classes = []
|
permission_classes = []
|
||||||
def post(self, request):
|
def post(self, request):
|
||||||
questioncat = request.data['questioncat']
|
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']:
|
if 'ydtms' in request.data and request.data['ydtms']:
|
||||||
queryset = queryset.exclude(id__in = request.data['ydtms'])
|
queryset = queryset.exclude(id__in = request.data['ydtms'])
|
||||||
total = queryset.count()
|
count = queryset.count()
|
||||||
queryset = queryset.order_by('id')[0:10]
|
pg = CommonPagination()
|
||||||
# pg = CommonPagination()
|
p = pg.paginate_queryset(queryset=queryset,request=request,view=self)
|
||||||
# p = pg.paginate_queryset(queryset=queryset,request=request,view=self)
|
serializer = QuestionSerializer(instance=p,many=True)
|
||||||
# serializer = QuestionSerializer(instance=p,many=True)
|
|
||||||
# return pg.get_paginated_response(serializer.data)
|
|
||||||
serializer = QuestionSerializer(instance=queryset,many=True)
|
|
||||||
collects = request.user.collects.all().values_list('id',flat=True) #当前用户收藏的题目
|
collects = request.user.collects.all().values_list('id',flat=True) #当前用户收藏的题目
|
||||||
results = serializer.data
|
results = serializer.data
|
||||||
for i in results:
|
for i in results:
|
||||||
|
@ -286,4 +283,4 @@ class ExerciseView(APIView):
|
||||||
i['is_collect'] = True
|
i['is_collect'] = True
|
||||||
else:
|
else:
|
||||||
i['is_collect'] = False
|
i['is_collect'] = False
|
||||||
return Response({'total':total, 'results':results})
|
return Response({'count':count, 'results':results})
|
Loading…
Reference in New Issue