Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search

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='已发放报告数量'),
+        ),
+    ]

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)

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() < 5000:
                 return None
             raise ParseError('单次请求数据量大,请分页获取')
         return super().paginate_queryset(queryset, request, view=view)