79d15292 by 周伟奇

fix args filter

1 parent 703b9f28
......@@ -269,7 +269,7 @@ class Command(BaseCommand, LoggerMixin):
loop = asyncio.get_event_loop()
tasks = [self.img_ocr_excel(wb, img_path) for img_path in img_path_list]
loop.run_until_complete(asyncio.wait(tasks))
loop.close()
# loop.close()
wb.save(excel_path)
# 整合excel文件上传至EDMS
except Exception as e:
......
......@@ -140,19 +140,18 @@ class DocView(GenericView, DocHandler):
upload_time_end = args.get('upload_time_end')
create_time_start = args.get('create_time_start')
create_time_end = args.get('create_time_end')
status_query = Q(status=status) if status else Q()
application_id_query = Q(application_id=application_id) if application_id else Q()
data_source_query = Q(data_source=data_source) if data_source else Q()
business_type_query = Q(business_type=business_type) if business_type else Q()
status_query = Q(status=status) if status is not None else Q()
application_id_query = Q(application_id=application_id) if application_id is not None else Q()
data_source_query = Q(data_source=data_source) if data_source is not None else Q()
business_type_query = Q(business_type=business_type) if business_type is not None else Q()
upload_finish_time_query = Q(upload_finish_time__gte=upload_time_start,
upload_finish_time__lt=upload_time_end + datetime.timedelta(days=1))\
if upload_time_start and upload_time_end else Q()
if upload_time_start is not None and upload_time_end is not None else Q()
create_time_query = Q(create_time__gte=create_time_start,
create_time__lt=create_time_end + datetime.timedelta(days=1))\
if create_time_start and create_time_end else Q()
if create_time_start is not None and create_time_end is not None else Q()
query = status_query & application_id_query & data_source_query & business_type_query\
& upload_finish_time_query & create_time_query
print(query)
val_tuple = ('id', 'application_id', 'upload_finish_time', 'create_time',
'business_type', 'data_source', 'status')
doc_queryset = UploadDocRecords.objects.filter(query).values(*val_tuple).order_by('-upload_finish_time')
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!