From b24ba07f9ba48a0a8ea3b1cf6069fa545ce32ea1 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 7 Jul 2023 17:40:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E6=9B=B4=E6=94=B9=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migrations/0051_auto_20230707_1739.py | 23 +++++++++++++++++++ server/apps/supervision/models.py | 4 ++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 server/apps/supervision/migrations/0051_auto_20230707_1739.py diff --git a/server/apps/supervision/migrations/0051_auto_20230707_1739.py b/server/apps/supervision/migrations/0051_auto_20230707_1739.py new file mode 100644 index 0000000..d319d85 --- /dev/null +++ b/server/apps/supervision/migrations/0051_auto_20230707_1739.py @@ -0,0 +1,23 @@ +# Generated by Django 3.2.12 on 2023-07-07 09:39 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('supervision', '0050_rename_end_time_task2_end_date'), + ] + + operations = [ + migrations.AlterField( + model_name='task2do', + name='num_expect', + field=models.PositiveIntegerField(blank=True, null=True, verbose_name='应发报告数'), + ), + migrations.AlterField( + model_name='task2do', + name='num_issue', + field=models.PositiveIntegerField(blank=True, null=True, verbose_name='已发放报告数量'), + ), + ] diff --git a/server/apps/supervision/models.py b/server/apps/supervision/models.py index 5ef2227..dfab7f2 100644 --- a/server/apps/supervision/models.py +++ b/server/apps/supervision/models.py @@ -171,8 +171,8 @@ class Task2Do(CommonBDModel): count_up = models.PositiveSmallIntegerField('完成上报内容数', default=0) count_all = models.PositiveSmallIntegerField('需上报内容数', default=9) - num_issue = models.PositiveSmallIntegerField('已发放报告数量', null=True, blank=True) - num_expect = models.PositiveSmallIntegerField('应发报告数', null=True, blank=True) + num_issue = models.PositiveIntegerField('已发放报告数量', null=True, blank=True) + num_expect = models.PositiveIntegerField('应发报告数', null=True, blank=True) num_acc = models.PositiveSmallIntegerField('重大质量事故', null=True, blank=True) num_error = models.PositiveSmallIntegerField('不准确报告数', null=True, blank=True) From 13ecf7fa3af19bf141f4da9d4bdab165aa0c3bb3 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 10 Jul 2023 11:20:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E5=88=86=E9=A1=B5=E9=99=90?= =?UTF-8?q?=E9=A2=9D=E8=AE=BE=E7=BD=AE=E4=B8=BA1000?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/utils/pagination.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/utils/pagination.py b/server/utils/pagination.py index 68f60d6..216da8b 100644 --- a/server/utils/pagination.py +++ b/server/utils/pagination.py @@ -8,7 +8,7 @@ class MyPagination(PageNumberPagination): def paginate_queryset(self, queryset, request, view=None): if request.query_params.get('pageoff', None) or request.query_params.get('page', None) == '0': - if queryset.count() < 500: + if queryset.count() < 1000: return None raise ParseError('单次请求数据量大,请分页获取') return super().paginate_queryset(queryset, request, view=view) From a0a18272a9601dd1c4a23e31c6dadca0960057ed Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 10 Jul 2023 12:14:40 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E5=88=86=E9=A1=B5=E9=99=90?= =?UTF-8?q?=E9=A2=9D=E8=AE=BE=E7=BD=AE=E4=B8=BA5000?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/utils/pagination.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/utils/pagination.py b/server/utils/pagination.py index 216da8b..2dd959c 100644 --- a/server/utils/pagination.py +++ b/server/utils/pagination.py @@ -8,7 +8,7 @@ class MyPagination(PageNumberPagination): def paginate_queryset(self, queryset, request, view=None): if request.query_params.get('pageoff', None) or request.query_params.get('page', None) == '0': - if queryset.count() < 1000: + if queryset.count() < 5000: return None raise ParseError('单次请求数据量大,请分页获取') return super().paginate_queryset(queryset, request, view=view)