From f3e8c5a0670befc11788aedce770be866a86a6db 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: Tue, 18 Apr 2023 10:47:44 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B4=97=E3=81=84=E6=9B=BF=E3=81=88?=
 =?UTF-8?q?=E7=94=A8=E3=83=9E=E3=82=B9=E3=82=BF=E4=BD=9C=E6=88=90=E5=87=A6?=
 =?UTF-8?q?=E7=90=86=E7=94=A8=E3=81=AEpython=E3=83=95=E3=82=A1=E3=82=A4?=
 =?UTF-8?q?=E3=83=AB=E3=81=AE=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/batch/datachange/res_mak_inst_lau.py  | 20 +++++++++++++++
 .../src/batch/jissekiaraigae.py               | 25 +++++++++++--------
 ecs/jskult-batch-daily/src/db/database.py     |  5 +++-
 3 files changed, 38 insertions(+), 12 deletions(-)
 create mode 100644 ecs/jskult-batch-daily/src/batch/datachange/res_mak_inst_lau.py

diff --git a/ecs/jskult-batch-daily/src/batch/datachange/res_mak_inst_lau.py b/ecs/jskult-batch-daily/src/batch/datachange/res_mak_inst_lau.py
new file mode 100644
index 00000000..bfd359a1
--- /dev/null
+++ b/ecs/jskult-batch-daily/src/batch/datachange/res_mak_inst_lau.py
@@ -0,0 +1,20 @@
+from src.db.database import Database
+from src.error.exceptions import BatchOperationException
+from src.logging.get_logger import get_logger
+
+logger = get_logger('実績洗替')
+
+
+def batch_process():
+    db = Database.get_instance()
+    try:
+        db.connect()
+    except Exception as e:
+        logger.info("実績洗替 データベース接続に失敗")
+        raise BatchOperationException(e)
+
+    logger.info('実績洗替 開始')
+    db.execute('CALL src05.v_inst_merge_t_create()')
+    db.execute('CALL src05.inst_merge_t_create()')
+    db.disconnect()
+    logger.info('実績洗替 終了')
diff --git a/ecs/jskult-batch-daily/src/batch/jissekiaraigae.py b/ecs/jskult-batch-daily/src/batch/jissekiaraigae.py
index 7f5d9fcf..93895f77 100644
--- a/ecs/jskult-batch-daily/src/batch/jissekiaraigae.py
+++ b/ecs/jskult-batch-daily/src/batch/jissekiaraigae.py
@@ -1,11 +1,14 @@
-from src.batch.datachange import emp_chg_inst_lau
-from src.logging.get_logger import get_logger
-
-logger = get_logger('実績洗替')
-
-
-def batch_process():
-    """実績洗替処理"""
-    logger.info('Start Jisseki Araigae Batch PGM.')
-    # 施設担当者洗替
-    emp_chg_inst_lau.batch_process()
+from src.batch.datachange import emp_chg_inst_lau
+from src.batch.datachange import res_mak_inst_lau
+from src.logging.get_logger import get_logger
+
+logger = get_logger('実績洗替')
+
+
+def batch_process():
+    """実績洗替処理"""
+    logger.info('Start Jisseki Araigae Batch PGM.')
+    # 洗替用マスタ作成
+    res_mak_inst_lau.batch_process()
+    # 施設担当者洗替
+    emp_chg_inst_lau.batch_process()
diff --git a/ecs/jskult-batch-daily/src/db/database.py b/ecs/jskult-batch-daily/src/db/database.py
index 7e8f845c..0317bc21 100644
--- a/ecs/jskult-batch-daily/src/db/database.py
+++ b/ecs/jskult-batch-daily/src/db/database.py
@@ -83,7 +83,10 @@ class Database:
         Raises:
             DBException: 接続失敗
         """
-        self.__connection = self.__engine.connect()
+        try:
+            self.__connection = self.__engine.connect()
+        except Exception as e:
+            raise DBException(e)
 
     def execute_select(self, select_query: str, parameters=None) -> list[dict]:
         """SELECTクエリを実行します。