From f4a5a653a6bcb26f2686e1a7b6d11a0faff6417d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= <x.takagi.k@nds-tyo.co.jp>
Date: Mon, 24 Jul 2023 14:21:49 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8D=98=E4=BD=93=E8=A9=A6=E9=A8=93?=
 =?UTF-8?q?=E4=B8=8D=E5=85=B7=E5=90=88=E5=AF=BE=E5=BF=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ecs/jskult-webapp/src/controller/master_mainte.py  |  3 ++-
 .../src/repositories/emp_chg_inst_repository.py    | 14 +++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ecs/jskult-webapp/src/controller/master_mainte.py b/ecs/jskult-webapp/src/controller/master_mainte.py
index f67c0e7f..046fc4ab 100644
--- a/ecs/jskult-webapp/src/controller/master_mainte.py
+++ b/ecs/jskult-webapp/src/controller/master_mainte.py
@@ -137,9 +137,10 @@ async def inst_emp_csv_upload(
 
     # 画面表示用のモデル
     error_message_list = []
+    content_type: str = csv_upload_form.csv_file.content_type.strip()
     if csv_upload_form.csv_file.size == 0:
         error_message_list.append('選択されたファイルが見つかりませんでした。')
-    elif csv_upload_form.csv_file.content_type != 'text/csv':
+    elif content_type != 'text/csv' and content_type != 'application/vnd.ms-excel' and content_type != 'application/octet-stream':
         error_message_list.append('選択されたファイル形式が"csv"ではありません。')
     elif csv_upload_form.csv_file.size >= constants.MENTE_CSV_UPLOAD_MAX_FILE_SIZE_BYTE:
         error_message_list.append('選択されたCSVファイルサイズが大きいです。100MB未満にしてください。')
diff --git a/ecs/jskult-webapp/src/repositories/emp_chg_inst_repository.py b/ecs/jskult-webapp/src/repositories/emp_chg_inst_repository.py
index 91236118..404d7bca 100644
--- a/ecs/jskult-webapp/src/repositories/emp_chg_inst_repository.py
+++ b/ecs/jskult-webapp/src/repositories/emp_chg_inst_repository.py
@@ -73,7 +73,7 @@ class EmpChgInstRepository(BaseRepository):
                 'update_user_name': create_user_name
             })
         except Exception as e:
-            logger.exception(f"DB Error : Exception={e.args}")
+            logger.exception(f'DB Error : Exception={e.args}')
             raise e
 
     UPDATE_END_DATE_SQL = """\
@@ -101,7 +101,7 @@ class EmpChgInstRepository(BaseRepository):
                 'update_user_name': update_user_name
             })
         except Exception as e:
-            logger.exception(f"DB Error : Exception={e.args}")
+            logger.exception(f'DB Error : Exception={e.args}')
             raise e
 
     UPDATE_EMP_CD_SQL = """\
@@ -128,7 +128,7 @@ class EmpChgInstRepository(BaseRepository):
                 'update_user_name': update_user_name
             })
         except Exception as e:
-            logger.exception(f"DB Error : Exception={e.args}")
+            logger.exception(f'DB Error : Exception={e.args}')
             raise e
 
     FETCH_COUNT_SQL = """\
@@ -153,7 +153,7 @@ class EmpChgInstRepository(BaseRepository):
                 return 0
             return models[0].count
         except Exception as e:
-            logger.exception(f"DB Error : Exception={e.args}")
+            logger.exception(f'DB Error : Exception={e.args}')
             raise e
         finally:
             self._database.disconnect()
@@ -195,7 +195,7 @@ class EmpChgInstRepository(BaseRepository):
             logger.debug(f'count= {df.shape[0]}')
             return df
         except Exception as e:
-            logger.exception(f"DB Error : Exception={e.args}")
+            logger.exception(f'DB Error : Exception={e.args}')
             raise e
         finally:
             self._database.disconnect()
@@ -286,7 +286,7 @@ class EmpChgInstRepository(BaseRepository):
             query = self.DELETE_SQL
             self._database.execute(query)
         except Exception as e:
-            logger.exception(f"DB Error : Exception={e.args}")
+            logger.exception(f'DB Error : Exception={e.args}')
             raise e
 
     COPY_TABLE_SQL = "INSERT INTO emp_chg_inst_wrk SELECT * FROM emp_chg_inst"
@@ -296,5 +296,5 @@ class EmpChgInstRepository(BaseRepository):
             query = self.COPY_TABLE_SQL
             self._database.execute(query)
         except Exception as e:
-            logger.exception(f"DB Error : Exception={e.args}")
+            logger.exception(f'DB Error : Exception={e.args}')
             raise e