Merge pull request #241 feature-NEWDWH2021-1163 into develop

ecs/jskult-batch-daily/src/batch/batch_functions.py

@@ -51,7 +51,13 @@ def update_batch_processing_flag_in_processing() -> None:
         BatchOperationException: DB操作の何らかのエラー
     """
     db = Database.get_instance()
-    sql = 'UPDATE src05.hdke_tbl SET bch_actf = :in_processing'
+    sql = """\
+    UPDATE src05.hdke_tbl
+    SET
+        bch_actf = :in_processing,
+        updater = CURRENT_USER(),
+        update_date = NOW()
+    """
     try:
         db.connect()
         db.execute(sql, {'in_processing': constants.BATCH_ACTF_BATCH_IN_PROCESSING})
@@ -75,7 +81,9 @@ def update_batch_process_complete() -> None:
     SET
         bch_actf = :batch_complete,
         dump_sts_kbn = :dump_unprocessed,
-        syor_date = DATE_FORMAT((src05.get_syor_date() + interval 1 day), '%Y%m%d') -- +1日
+        syor_date = DATE_FORMAT((src05.get_syor_date() + interval 1 day), '%Y%m%d'), -- +1日
+        updater = CURRENT_USER(),
+        update_date = NOW()
     """
     try:
         db.connect()

ecs/jskult-batch-daily/src/jobctrl_daily.py

@@ -9,12 +9,11 @@ from src.batch.common.batch_context import BatchContext
 from src.batch.common.calendar_file import CalendarFile
 from src.batch.dcf_inst_merge import create_dcf_inst_merge
 from src.batch.laundering import mst_inst_laundering
-from src.batch.ultmarc import ultmarc_process
+from src.batch.ultmarc import output_vjsk_inst_pharm_data, ultmarc_process
 from src.batch.vjsk import vjsk_importer
 from src.error.exceptions import BatchOperationException
 from src.logging.get_logger import get_logger
 from src.system_var import constants
-from src.batch.ultmarc import output_vjsk_inst_pharm_data
 
 logger = get_logger('日次処理コントロール')
 
@@ -46,7 +45,7 @@ def exec():
         # バッチ共通設定に処理日を追加
         batch_context.syor_date = syor_date
 
-        # 稼働日かかどうかを、V実消化非稼働日ファイルをダウンロードして判定
+        # 稼働日かどうかを、V実消化非稼働日ファイルをダウンロードして判定
         try:
             holiday_list_file_path = ConfigBucket().download_holiday_list()
             holiday_calendar = CalendarFile(holiday_list_file_path)

ecs/jskult-dbdump/src/batch/batch_functions.py

@@ -46,7 +46,13 @@ def update_dump_status_kbn_in_processing() -> None:
         BatchOperationException: DB操作の何らかのエラー
     """
     db = Database.get_instance()
-    sql = 'UPDATE src05.hdke_tbl SET dump_sts_kbn = :in_processing'
+    sql = """\
+    UPDATE src05.hdke_tbl
+    SET
+        dump_sts_kbn = :in_processing,
+        updater = CURRENT_USER(),
+        update_date = NOW()
+    """
     try:
         db.connect()
         db.execute(sql, {'in_processing': constants.BATCH_ACTF_BATCH_IN_PROCESSING})
@@ -68,7 +74,9 @@ def update_dump_status_kbn_error() -> None:
     sql = """\
     UPDATE src05.hdke_tbl
     SET
-        dump_sts_kbn = :dump_unprocessed
+        dump_sts_kbn = :dump_unprocessed,
+        updater = CURRENT_USER(),
+        update_date = NOW()
     """
     try:
         db.connect()
@@ -93,7 +101,9 @@ def update_dump_status_kbn_complete() -> None:
     sql = """\
     UPDATE src05.hdke_tbl
     SET
-        dump_sts_kbn = :dump_unprocessed
+        dump_sts_kbn = :dump_unprocessed,
+        updater = CURRENT_USER(),
+        update_date = NOW()
     """
     try:
         db.connect()