From 39907c1ede743a82af32f5c521d5c0f83b2f5348 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Mon, 31 Jul 2023 13:48:36 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=97=A5=E4=BB=98=E3=83=86=E3=83=BC?= =?UTF-8?q?=E3=83=96=E3=83=AB=E6=9B=B4=E6=96=B0=E6=99=82=E3=81=AB=E3=80=81?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=80=85=E3=81=A8=E6=9B=B4=E6=96=B0=E6=97=A5?= =?UTF-8?q?=E6=99=82=E3=82=92=E4=B8=8A=E6=9B=B8=E3=81=8D=E3=81=97=E3=81=A6?= =?UTF-8?q?=E3=81=84=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F=E3=81=AE=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/batch/batch_functions.py | 12 ++++++++++-- ecs/jskult-dbdump/src/batch/batch_functions.py | 16 +++++++++++++--- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/batch_functions.py b/ecs/jskult-batch-daily/src/batch/batch_functions.py index b8e223e2..87a7793d 100644 --- a/ecs/jskult-batch-daily/src/batch/batch_functions.py +++ b/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() diff --git a/ecs/jskult-dbdump/src/batch/batch_functions.py b/ecs/jskult-dbdump/src/batch/batch_functions.py index 87231e17..e51f336b 100644 --- a/ecs/jskult-dbdump/src/batch/batch_functions.py +++ b/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() From bb9530603c62de905b95f8d1d78178ec7a5497a2 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Mon, 31 Jul 2023 13:52:48 +0900 Subject: [PATCH 2/2] =?UTF-8?q?style:=20=E3=82=B3=E3=83=A1=E3=83=B3?= =?UTF-8?q?=E3=83=88=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-batch-daily/src/jobctrl_daily.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ecs/jskult-batch-daily/src/jobctrl_daily.py b/ecs/jskult-batch-daily/src/jobctrl_daily.py index 3bd09a8d..313d6c29 100644 --- a/ecs/jskult-batch-daily/src/jobctrl_daily.py +++ b/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)