7d44ed22 by 周伟奇

fix bug

1 parent 7965c565
...@@ -345,8 +345,8 @@ class BSWorkbook(Workbook): ...@@ -345,8 +345,8 @@ class BSWorkbook(Workbook):
345 metadata_rows.extend(verify_list) 345 metadata_rows.extend(verify_list)
346 for r in range(verify_start, len(metadata_rows)+1): 346 for r in range(verify_start, len(metadata_rows)+1):
347 verify_highlight_row.append(r) 347 verify_highlight_row.append(r)
348 metadata_rows.append(self.blank_row)
348 349
349 metadata_rows.append(self.blank_row)
350 metadata_rows.append(self.code_header) 350 metadata_rows.append(self.code_header)
351 metadata_rows.extend(code) 351 metadata_rows.extend(code)
352 352
......
...@@ -889,7 +889,8 @@ class DocView(GenericView, DocHandler): ...@@ -889,7 +889,8 @@ class DocView(GenericView, DocHandler):
889 create_time__lt=create_time_end + datetime.timedelta(days=1))\ 889 create_time__lt=create_time_end + datetime.timedelta(days=1))\
890 if create_time_start is not None and create_time_end is not None else Q() 890 if create_time_start is not None and create_time_end is not None else Q()
891 query = application_id_query & status_query & data_source_query & upload_finish_time_query & create_time_query 891 query = application_id_query & status_query & data_source_query & upload_finish_time_query & create_time_query
892 val_tuple = ('id', 'application_id', 'upload_finish_time', 'create_time', 'document_scheme', 'data_source', 'status', 'page_count') 892 val_tuple = ('id', 'application_id', 'upload_finish_time', 'create_time', 'document_scheme', 'data_source',
893 'status', 'duration', 'page_count')
893 doc_class, prefix = self.get_doc_class(business_type) 894 doc_class, prefix = self.get_doc_class(business_type)
894 total = doc_class.objects.filter(query).count() 895 total = doc_class.objects.filter(query).count()
895 start_index = page_size * (page - 1) 896 start_index = page_size * (page - 1)
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!