From c484cd01e926e8f883e6db25b33c7c5d2eec316b Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Mon, 28 Aug 2023 10:54:22 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=E3=83=9E=E3=83=AB=E3=83=81=E3=82=B9?= =?UTF-8?q?=E3=83=AC=E3=83=83=E3=83=89=E3=81=AB=E3=81=97=E3=81=A6=E3=81=BF?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-webapp/src/controller/bio_download.py | 4 +++- ecs/jskult-webapp/src/controller/master_mainte.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ecs/jskult-webapp/src/controller/bio_download.py b/ecs/jskult-webapp/src/controller/bio_download.py index 9b4fb607..65e5baff 100644 --- a/ecs/jskult-webapp/src/controller/bio_download.py +++ b/ecs/jskult-webapp/src/controller/bio_download.py @@ -29,7 +29,7 @@ router = APIRouter() @router.post('/download') -async def download_bio_data( +def download_bio_data( search_param: BioModel = Depends(BioModel.as_body), download_param: BioDownloadModel = Depends(BioDownloadModel.as_body), bio_service: BioViewService = Depends(get_service(BioViewService)), @@ -63,6 +63,8 @@ async def download_bio_data( # ファイルを書き出し(Excel or CSV) local_file_path = _write_bio_data_to_file(bio_service, download_param, search_result_df, download_file_name) + logger.info('ファイル書き出し完了') + # ローカルファイルからS3にアップロードし、ダウンロード用URLを取得する try: bio_service.upload_bio_data_file(local_file_path) diff --git a/ecs/jskult-webapp/src/controller/master_mainte.py b/ecs/jskult-webapp/src/controller/master_mainte.py index 460e256a..f205824e 100644 --- a/ecs/jskult-webapp/src/controller/master_mainte.py +++ b/ecs/jskult-webapp/src/controller/master_mainte.py @@ -261,7 +261,7 @@ def inst_emp_csv_download_view( @router.post('/download', response_class=HTMLResponse) -async def inst_emp_csv_download( +def inst_emp_csv_download( request: Request, csv_download_form: Optional[MasterMainteCsvDlModel] = Depends(MasterMainteCsvDlModel.as_form), master_mainte_service: MasterMainteService = Depends(get_service(MasterMainteService)),