45d3d99c by 冯轩

Merge branch 'feature/CHINARPA-3529' into feature/uat-tmp

2 parents 135b28e3 d373a787
...@@ -1978,7 +1978,7 @@ class Command(BaseCommand, LoggerMixin): ...@@ -1978,7 +1978,7 @@ class Command(BaseCommand, LoggerMixin):
1978 self.log_base, task_str, traceback.format_exc())) 1978 self.log_base, task_str, traceback.format_exc()))
1979 else: 1979 else:
1980 self.online_log.info('{0} [process complete] [task={1}]'.format(self.log_base, task_str)) 1980 self.online_log.info('{0} [process complete] [task={1}]'.format(self.log_base, task_str))
1981 os.remove(excel_path) 1981 # os.remove(excel_path)
1982 1982
1983 # report新增流水真伪 1983 # report新增流水真伪
1984 try: 1984 try:
......
...@@ -1084,6 +1084,8 @@ class DocView(DocGenericView, DocHandler): ...@@ -1084,6 +1084,8 @@ class DocView(DocGenericView, DocHandler):
1084 application_link = '{0}/showList/showList?entity={1}&scheme={2}&case_id={3}'.format( 1084 application_link = '{0}/showList/showList?entity={1}&scheme={2}&case_id={3}'.format(
1085 conf.BASE_URL, prefix, tmp_scheme, doc_dict['application_id']) 1085 conf.BASE_URL, prefix, tmp_scheme, doc_dict['application_id'])
1086 doc_dict['target_url'] = application_link 1086 doc_dict['target_url'] = application_link
1087 doc_id = doc_dict.get('id')
1088 doc_dict['pdf_link'] = self.get_link(doc_id, business_type)
1087 1089
1088 # total = len(doc_list) 1090 # total = len(doc_list)
1089 pagination = {'current': page, 'total': total, 'page_size': page_size} 1091 pagination = {'current': page, 'total': total, 'page_size': page_size}
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!