56fac368 by 冯轩

merge

2 parents 069b2014 75e94e77
...@@ -6,7 +6,7 @@ urlpatterns = [ ...@@ -6,7 +6,7 @@ urlpatterns = [
6 path(r'', views.DocView.as_view()), 6 path(r'', views.DocView.as_view()),
7 path(r'query/employee', views.EmployeeView.as_view()), 7 path(r'query/employee', views.EmployeeView.as_view()),
8 path(r'query/greenBookHistoryFile', views.SearchGBHistoryFileView.as_view()), 8 path(r'query/greenBookHistoryFile', views.SearchGBHistoryFileView.as_view()),
9 path(r'query/greenBookHistoryFile', views.DownloadGBHistoryFileView.as_view()), 9 path(r'download/greenBookHistoryFile', views.DownloadGBHistoryFileView.as_view()),
10 path(r'invoice/downloadExcel', views.InvoiceExcelView.as_view()), 10 path(r'invoice/downloadExcel', views.InvoiceExcelView.as_view()),
11 path(r'invoice/queryInfo', views.InvoiceQueryInfoView.as_view()), 11 path(r'invoice/queryInfo', views.InvoiceQueryInfoView.as_view()),
12 path(r'contract/v1', views.SEContractView.as_view()), 12 path(r'contract/v1', views.SEContractView.as_view()),
......
...@@ -2077,12 +2077,12 @@ class SearchGBHistoryFileView(GenericView): ...@@ -2077,12 +2077,12 @@ class SearchGBHistoryFileView(GenericView):
2077 @use_args(employee_args, location='data') 2077 @use_args(employee_args, location='data')
2078 def post(self, request, args): 2078 def post(self, request, args):
2079 2079
2080 filePath = args.get('filePath') 2080 file_path = args.get('file_path')
2081 business_type = args.get('business_type') 2081 business_type = args.get('business_type')
2082 2082
2083 gb_history_file_class = HILGreenBookHistoryFile if business_type in consts.HIL_SET else AFCGreenBookHistoryFile 2083 gb_history_file_class = HILGreenBookHistoryFile if business_type in consts.HIL_SET else AFCGreenBookHistoryFile
2084 ecm = ECM() 2084 ecm = ECM()
2085 response_json = ecm.search_doc_info_list(filePath, business_type) 2085 response_json = ecm.search_doc_info_list(file_path, business_type)
2086 data_objects = response_json['Envelope']['Body']['executeResponse']['return']['dataPackage']['DataObjects'] 2086 data_objects = response_json['Envelope']['Body']['executeResponse']['return']['dataPackage']['DataObjects']
2087 for data_object in data_objects: 2087 for data_object in data_objects:
2088 object_id = data_object['Identity']['ObjectId']['@id'] 2088 object_id = data_object['Identity']['ObjectId']['@id']
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!