fix date filter
Showing
1 changed file
with
6 additions
and
2 deletions
1 | import os | 1 | import os |
2 | import time | 2 | import time |
3 | import random | 3 | import random |
4 | import datetime | ||
4 | from django.utils import timezone | 5 | from django.utils import timezone |
5 | from django.db.utils import IntegrityError | 6 | from django.db.utils import IntegrityError |
6 | from django.db.models import Q | 7 | from django.db.models import Q |
... | @@ -143,12 +144,15 @@ class DocView(GenericView, DocHandler): | ... | @@ -143,12 +144,15 @@ class DocView(GenericView, DocHandler): |
143 | application_id_query = Q(application_id=application_id) if application_id else Q() | 144 | application_id_query = Q(application_id=application_id) if application_id else Q() |
144 | data_source_query = Q(data_source=data_source) if data_source else Q() | 145 | data_source_query = Q(data_source=data_source) if data_source else Q() |
145 | business_type_query = Q(business_type=business_type) if business_type else Q() | 146 | business_type_query = Q(business_type=business_type) if business_type else Q() |
146 | upload_finish_time_query = Q(upload_finish_time__gte=upload_time_start, upload_finish_time__lte=upload_time_end)\ | 147 | upload_finish_time_query = Q(upload_finish_time__gte=upload_time_start, |
148 | upload_finish_time__lt=upload_time_end + datetime.timedelta(days=1))\ | ||
147 | if upload_time_start and upload_time_end else Q() | 149 | if upload_time_start and upload_time_end else Q() |
148 | create_time_query = Q(create_time__gte=create_time_start, create_time__lte=create_time_end)\ | 150 | create_time_query = Q(create_time__gte=create_time_start, |
151 | create_time__lt=create_time_end + datetime.timedelta(days=1))\ | ||
149 | if create_time_start and create_time_end else Q() | 152 | if create_time_start and create_time_end else Q() |
150 | query = status_query & application_id_query & data_source_query & business_type_query\ | 153 | query = status_query & application_id_query & data_source_query & business_type_query\ |
151 | & upload_finish_time_query & create_time_query | 154 | & upload_finish_time_query & create_time_query |
155 | print(query) | ||
152 | val_tuple = ('id', 'application_id', 'upload_finish_time', 'create_time', | 156 | val_tuple = ('id', 'application_id', 'upload_finish_time', 'create_time', |
153 | 'business_type', 'data_source', 'status') | 157 | 'business_type', 'data_source', 'status') |
154 | doc_queryset = UploadDocRecords.objects.filter(query).values(*val_tuple).order_by('-upload_finish_time') | 158 | doc_queryset = UploadDocRecords.objects.filter(query).values(*val_tuple).order_by('-upload_finish_time') | ... | ... |
-
Please register or sign in to post a comment