diff --git a/server/apps/supervision/migrations/0020_auto_20210401_1018.py b/server/apps/supervision/migrations/0020_auto_20210401_1018.py new file mode 100644 index 0000000..6dcf148 --- /dev/null +++ b/server/apps/supervision/migrations/0020_auto_20210401_1018.py @@ -0,0 +1,21 @@ +# Generated by Django 3.0.5 on 2021-04-01 02:18 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('supervision', '0019_auto_20210401_0842'), + ] + + operations = [ + migrations.RemoveField( + model_name='task', + name='confirm_rate', + ), + migrations.RemoveField( + model_name='task', + name='up_rate', + ), + ] diff --git a/server/apps/supervision/views.py b/server/apps/supervision/views.py index cafbef0..6ce07dd 100644 --- a/server/apps/supervision/views.py +++ b/server/apps/supervision/views.py @@ -195,7 +195,7 @@ class RecordViewSet(RbacFilterSet, PageOrNot, CreateUpdateCustomMixin, ModelView queryset = Record.objects.all() serializer_class = RecordSerializer search_fields = ['content__name','task__name'] - ordering_fields = ['content__sortnum', 'belong_dept__sort'] + ordering_fields = ['content__sortnum', 'belong_dept__sort', 'task'] ordering = ['content__sortnum', '-create_time'] filter_class = RecordFilter # 过滤类 diff --git a/server/server/.gitignore b/server/server/.gitignore new file mode 100644 index 0000000..a2c0e53 --- /dev/null +++ b/server/server/.gitignore @@ -0,0 +1 @@ +settings_pro.py \ No newline at end of file diff --git a/server/utils/pagination.py b/server/utils/pagination.py index 5496da8..8f18c67 100644 --- a/server/utils/pagination.py +++ b/server/utils/pagination.py @@ -5,13 +5,13 @@ from rest_framework.exceptions import ParseError class MyPagination(PageNumberPagination): page_size = 10 page_size_query_param = 'page_size' + class PageOrNot: def paginate_queryset(self, queryset): if (self.paginator is None): return None - - elif self.request.query_params.get('pageoff', None) and self.request.query_params: + elif self.request.query_params.get('pageoff', None) and queryset.count()<500: return None - elif self.request.query_params.get('pageoff', None) and self.get_queryset().count()>=500: + elif self.request.query_params.get('pageoff', None) and queryset.count()>=500: raise ParseError('单次请求数据量大,请求中止') return self.paginator.paginate_queryset(queryset, self.request, view=self) \ No newline at end of file