|
19 | 19 | import openpyxl |
20 | 20 | from celery_once import AlreadyQueued |
21 | 21 | from django.core import validators |
22 | | -from django.db import transaction |
| 22 | +from django.db import transaction, models |
23 | 23 | from django.db.models import QuerySet, Count |
24 | 24 | from django.db.models.functions import Substr, Reverse |
25 | 25 | from django.http import HttpResponse |
|
28 | 28 | from rest_framework import serializers |
29 | 29 | from xlwt import Utils |
30 | 30 |
|
31 | | -from common.db.search import native_search, native_page_search |
| 31 | +from common.db.search import native_search, native_page_search, get_dynamics_model |
32 | 32 | from common.event import ListenerManagement |
33 | 33 | from common.event.common import work_thread_pool |
34 | 34 | from common.exception.app_exception import AppApiException |
@@ -443,11 +443,17 @@ def get_query_set(self): |
443 | 443 | else: |
444 | 444 | query_set = query_set.filter(status__iregex='^[2n]*$') |
445 | 445 | order_by = self.data.get('order_by', '') |
| 446 | + order_by_query_set = QuerySet(model=get_dynamics_model( |
| 447 | + {'char_length': models.CharField(), 'paragraph_count': models.IntegerField(), |
| 448 | + "update_time": models.IntegerField(), 'create_time': models.DateTimeField()})) |
446 | 449 | if order_by: |
447 | | - query_set = query_set.order_by(order_by) |
| 450 | + order_by_query_set = order_by_query_set.order_by(order_by) |
448 | 451 | else: |
449 | | - query_set = query_set.order_by('-create_time', 'id') |
450 | | - return query_set |
| 452 | + order_by_query_set = order_by_query_set.order_by('-create_time', 'id') |
| 453 | + return { |
| 454 | + 'document_custom_sql': query_set, |
| 455 | + 'order_by_query': order_by_query_set |
| 456 | + } |
451 | 457 |
|
452 | 458 | def list(self, with_valid=False): |
453 | 459 | if with_valid: |
|
0 commit comments