From 3a98128b11766e8eb081dcc53a41cb2335b20c2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= Date: Wed, 10 May 2023 15:34:16 +0900 Subject: [PATCH 1/7] =?UTF-8?q?feat:=20DCF=E6=96=BD=E8=A8=AD=E7=B5=B1?= =?UTF-8?q?=E5=90=88=E3=83=9E=E3=82=B9=E3=82=BF=E4=BD=9C=E6=88=90(?= =?UTF-8?q?=E4=BB=AE)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dcf_inst_merge/create_dcf_inst_merge.py | 138 ++++++++++++++++++ .../batch/laundering/create_dcf_inst_merge.py | 15 -- 2 files changed, 138 insertions(+), 15 deletions(-) create mode 100644 ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py delete mode 100644 ecs/jskult-batch-daily/src/batch/laundering/create_dcf_inst_merge.py diff --git a/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py b/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py new file mode 100644 index 00000000..f567ebae --- /dev/null +++ b/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py @@ -0,0 +1,138 @@ +from src.batch.batch_functions import logging_sql +from src.batch.common.batch_context import BatchContext +from src.db.database import Database +from src.error.exceptions import BatchOperationException +from src.logging.get_logger import get_logger +from src.time.elapsed_time import ElapsedTime + +batch_context = BatchContext.get_instance() +logger = get_logger('DCF施設統合マスタ作成') + + +def exec(): + """DCF施設統合マスタ作成""" + + # アルトマーク取込が行われていない場合は処理をスキップする + # if not batch_context.is_ultmarc_imported: + # logger.info('アルトマーク取込が行われていないため、DCF施設統合マスタ作成処理をスキップします。') + + db = Database.get_instance() + try: + db.connect() + db.begin() + logger.debug('DCF施設統合マスタ作成処理開始') + # COM施設からDCF施設統合マスタに登録 + _insert_dcf_inst_merge_from_com_ci(db) + db.commit() + logger.debug('DCF施設統合マスタ作成処理終了') + except Exception as e: + db.rollback() + raise BatchOperationException(e) + finally: + db.disconnect() + + +def _insert_dcf_inst_merge_from_com_ci(db: Database): + # com_ciにdcf_inst_mergeにinsert + creater = 'batchuser' + enabledFlg = 'Y' + + try: + result = db.execute_select( + """ + SELECT + ci.dcf_dsf_inst_cd AS dcf_dsf_inst_cd, + ci.form_inst_name_kanji AS form_inst_name_kanji, + ci.dup_opp_cd AS dup_opp_cd, + ( + SELECT + dupci.form_inst_name_kanji + FROM + src05.com_inst AS dupci + WHERE + dupci.dcf_dsf_inst_cd = ci.dup_opp_cd + ) AS dup_inst_name_kanji, + DATE_FORMAT(DATE_ADD((SELECT syor_date FROM src05.hdke_tbl),INTERVAL 1 MONTH),'%Y%m') AS sys_update_date + FROM + src05.com_inst AS ci + WHERE + CHAR_LENGTH(ci.dup_opp_cd) > 0 + AND ci.delete_sche_reason_cd = 'D' + AND ci.abolish_ymd IS NULL + AND DATE_FORMAT(ci.sys_update_date, '%Y%m%d') BETWEEN (SELECT syor_date FROM src05.hdke_tbl) AND DATE_FORMAT(SYSDATE(), '%Y%m%d') + AND NOT EXISTS ( + SELECT + dim.dcf_inst_cd + FROM + src05.dcf_inst_merge AS dim + WHERE + dim.dcf_inst_cd = ci.dcf_dsf_inst_cd + ) + AND ( + EXISTS ( + SELECT + eci.inst_cd + FROM + src05.emp_chg_inst AS eci + WHERE + eci.inst_cd = ci.dcf_dsf_inst_cd + ) + OR ( + SELECT + sl.inst_cd + FROM + src05.sales_lau AS sl + WHERE + sl.inst_cd = ci.dcf_dsf_inst_cd + ) + ) + """ + ) + logger.debug('重複コードがあるデータの取得に成功') + except Exception as e: + logger.debug('重複コードがあるデータの取得に失敗') + raise e + + if len(result) == 0: + logger.info('重複コードがあるデータはありません') + return + + values_clauses = [] + params = {'enabledFlg': enabledFlg, 'creater': creater, "updater": creater} + clauses_no = 0 + for row in result: + dcfInstCdArr = f'dcfInstCd{clauses_no}' + dupOppCdArr = f'dupOppCd{clauses_no}' + tekiyoMonthArr = f'tekiyoMonth{clauses_no}' + placeholders = f'(:{dcfInstCdArr}, :{dupOppCdArr}, :{tekiyoMonthArr}, :enabledFlg, :creater, SYSDATE(), :updater, SYSDATE())' + values_clauses.append(placeholders) + params[dcfInstCdArr] = row['dcf_dsf_inst_cd'] + params[dupOppCdArr] = row['dup_opp_cd'] + params[tekiyoMonthArr] = row['sys_update_date'] + clauses_no += 1 + + insert_sql = f""" + INSERT INTO + src05.dcf_inst_merge ( + dcf_inst_cd, + dup_opp_cd, + tekiyo_month, + enabled_flg, + creater, + create_date, + updater, + update_date + ) VALUES + {','.join(values_clauses)} + """ + + try: + elapsed_time = ElapsedTime() + res = db.execute(insert_sql, params) + logging_sql(logger, insert_sql) + logger.info(f'COM施設からDCF施設統合マスタに登録成功, {res.rowcount} 行更新 ({elapsed_time.of})') + except Exception as e: + logger.debug('COM施設からDCF施設統合マスタの登録に失敗') + raise e + + return diff --git a/ecs/jskult-batch-daily/src/batch/laundering/create_dcf_inst_merge.py b/ecs/jskult-batch-daily/src/batch/laundering/create_dcf_inst_merge.py deleted file mode 100644 index 974aa329..00000000 --- a/ecs/jskult-batch-daily/src/batch/laundering/create_dcf_inst_merge.py +++ /dev/null @@ -1,15 +0,0 @@ -from src.batch.common.batch_context import BatchContext -from src.logging.get_logger import get_logger - -batch_context = BatchContext.get_instance() -logger = get_logger('DCF施設統合マスタ作成') - - -def exec(): - """DCF施設統合マスタ作成""" - - # アルトマーク取込が行われていない場合は処理をスキップする - if not batch_context.is_ultmarc_imported: - logger.info('アルトマーク取込が行われていないため、DCF施設統合マスタ作成処理をスキップします。') - - pass From 3215a92e70a5f755670c88fa9ef830494e2ceb24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= Date: Wed, 10 May 2023 18:31:59 +0900 Subject: [PATCH 2/7] =?UTF-8?q?feat:=20=E3=83=AD=E3=82=B0=E5=87=BA?= =?UTF-8?q?=E5=8A=9B=E5=87=A6=E7=90=86=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dcf_inst_merge/create_dcf_inst_merge.py | 53 +++++++++++++++---- 1 file changed, 42 insertions(+), 11 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py b/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py index f567ebae..301c9337 100644 --- a/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py +++ b/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py @@ -13,8 +13,8 @@ def exec(): """DCF施設統合マスタ作成""" # アルトマーク取込が行われていない場合は処理をスキップする - # if not batch_context.is_ultmarc_imported: - # logger.info('アルトマーク取込が行われていないため、DCF施設統合マスタ作成処理をスキップします。') + if not batch_context.is_ultmarc_imported: + logger.info('アルトマーク取込が行われていないため、DCF施設統合マスタ作成処理をスキップします。') db = Database.get_instance() try: @@ -22,8 +22,10 @@ def exec(): db.begin() logger.debug('DCF施設統合マスタ作成処理開始') # COM施設からDCF施設統合マスタに登録 - _insert_dcf_inst_merge_from_com_ci(db) - db.commit() + (success, result) = _insert_dcf_inst_merge_from_com_ci(db) + # DCF施設統合マスタが追加ログを出力する + if success: + _output_dcf_inst_merge_log(result) logger.debug('DCF施設統合マスタ作成処理終了') except Exception as e: db.rollback() @@ -32,11 +34,8 @@ def exec(): db.disconnect() -def _insert_dcf_inst_merge_from_com_ci(db: Database): +def _insert_dcf_inst_merge_from_com_ci(db: Database) -> tuple[bool, list[dict]]: # com_ciにdcf_inst_mergeにinsert - creater = 'batchuser' - enabledFlg = 'Y' - try: result = db.execute_select( """ @@ -95,16 +94,16 @@ def _insert_dcf_inst_merge_from_com_ci(db: Database): if len(result) == 0: logger.info('重複コードがあるデータはありません') - return + return False, None values_clauses = [] - params = {'enabledFlg': enabledFlg, 'creater': creater, "updater": creater} + params = {} clauses_no = 0 for row in result: dcfInstCdArr = f'dcfInstCd{clauses_no}' dupOppCdArr = f'dupOppCd{clauses_no}' tekiyoMonthArr = f'tekiyoMonth{clauses_no}' - placeholders = f'(:{dcfInstCdArr}, :{dupOppCdArr}, :{tekiyoMonthArr}, :enabledFlg, :creater, SYSDATE(), :updater, SYSDATE())' + placeholders = f'(:{dcfInstCdArr}, :{dupOppCdArr}, :{tekiyoMonthArr}, "Y", CURRENT_USER(), SYSDATE(), CURRENT_USER(), SYSDATE())' values_clauses.append(placeholders) params[dcfInstCdArr] = row['dcf_dsf_inst_cd'] params[dupOppCdArr] = row['dup_opp_cd'] @@ -130,9 +129,41 @@ def _insert_dcf_inst_merge_from_com_ci(db: Database): elapsed_time = ElapsedTime() res = db.execute(insert_sql, params) logging_sql(logger, insert_sql) + db.commit() logger.info(f'COM施設からDCF施設統合マスタに登録成功, {res.rowcount} 行更新 ({elapsed_time.of})') except Exception as e: logger.debug('COM施設からDCF施設統合マスタの登録に失敗') raise e + return (True, result) + + +def _output_dcf_inst_merge_log(result: list[dict]): + sys_update_date = result[0]['sys_update_date'] + setYearMonth = '{set_year}年{set_month}月'.format( + set_year=sys_update_date[0:4], + set_month=sys_update_date[-2:] + ) + + add_dct_inst_list = [] + for row in result: + add_dct_inst_list.append("""DCF施設コード　{dcf_dsf_inst_cd}　{form_inst_name_kanji}, 　重複時相手先コード　{dup_opp_cd}　{dup_inst_name_kanji}""".format( + dcf_dsf_inst_cd=row['dcf_dsf_inst_cd'], + form_inst_name_kanji=row['form_inst_name_kanji'], + dup_opp_cd=row['dup_opp_cd'], + dup_inst_name_kanji=row['dup_inst_name_kanji'] + ) + ) + + add_dct_inst_list = '\n'.join(add_dct_inst_list) + logger.info( + f"""[NOTICE]DCF施設統合マスタが追加されました。 +********************************************************** +適用月度{setYearMonth} +********************************************************** +{add_dct_inst_list} +********************************************************** +合計　{len(result)}件 + """ + ) return From 2be8461f5aadb5d4cc9d987405d8561d58b724bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= Date: Thu, 11 May 2023 09:59:06 +0900 Subject: [PATCH 3/7] =?UTF-8?q?feat:=20DCF=E6=96=BD=E8=A8=AD=E7=B5=B1?= =?UTF-8?q?=E5=90=88=E3=83=9E=E3=82=B9=E3=82=BF=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dcf_inst_merge/create_dcf_inst_merge.py | 42 +++++++++---------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py b/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py index 301c9337..de00baea 100644 --- a/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py +++ b/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py @@ -22,10 +22,10 @@ def exec(): db.begin() logger.debug('DCF施設統合マスタ作成処理開始') # COM施設からDCF施設統合マスタに登録 - (success, result) = _insert_dcf_inst_merge_from_com_ci(db) - # DCF施設統合マスタが追加ログを出力する - if success: - _output_dcf_inst_merge_log(result) + (is_add_dcf_inst, result) = _insert_dcf_inst_merge_from_com_ci(db) + # DCF施設統合マスタの追加のログを出力する + if is_add_dcf_inst: + _output_add_dcf_inst_log(result) logger.debug('DCF施設統合マスタ作成処理終了') except Exception as e: db.rollback() @@ -35,10 +35,10 @@ def exec(): def _insert_dcf_inst_merge_from_com_ci(db: Database) -> tuple[bool, list[dict]]: - # com_ciにdcf_inst_mergeにinsert + # com_ciからdcf_inst_mergeにinsert + # 重複コードがあるデータを取得する(処理日～システム日付を対象) try: - result = db.execute_select( - """ + sql = """ SELECT ci.dcf_dsf_inst_cd AS dcf_dsf_inst_cd, ci.form_inst_name_kanji AS form_inst_name_kanji, @@ -85,9 +85,10 @@ def _insert_dcf_inst_merge_from_com_ci(db: Database) -> tuple[bool, list[dict]]: sl.inst_cd = ci.dcf_dsf_inst_cd ) ) - """ - ) - logger.debug('重複コードがあるデータの取得に成功') + """ + result = db.execute_select(sql) + logging_sql(logger, sql) + logger.info('重複コードがあるデータの取得に成功') except Exception as e: logger.debug('重複コードがあるデータの取得に失敗') raise e @@ -96,9 +97,10 @@ def _insert_dcf_inst_merge_from_com_ci(db: Database) -> tuple[bool, list[dict]]: logger.info('重複コードがあるデータはありません') return False, None + # DCF施設統合マスタ追加 values_clauses = [] params = {} - clauses_no = 0 + clauses_no = 1 for row in result: dcfInstCdArr = f'dcfInstCd{clauses_no}' dupOppCdArr = f'dupOppCd{clauses_no}' @@ -138,32 +140,26 @@ def _insert_dcf_inst_merge_from_com_ci(db: Database) -> tuple[bool, list[dict]]: return (True, result) -def _output_dcf_inst_merge_log(result: list[dict]): +def _output_add_dcf_inst_log(result: list[dict]): sys_update_date = result[0]['sys_update_date'] setYearMonth = '{set_year}年{set_month}月'.format( set_year=sys_update_date[0:4], set_month=sys_update_date[-2:] ) + add_dct_inst = 'DCF施設コード　{dcf_dsf_inst_cd}　{form_inst_name_kanji}, 　重複時相手先コード　{dup_opp_cd}　{dup_inst_name_kanji}' add_dct_inst_list = [] for row in result: - add_dct_inst_list.append("""DCF施設コード　{dcf_dsf_inst_cd}　{form_inst_name_kanji}, 　重複時相手先コード　{dup_opp_cd}　{dup_inst_name_kanji}""".format( - dcf_dsf_inst_cd=row['dcf_dsf_inst_cd'], - form_inst_name_kanji=row['form_inst_name_kanji'], - dup_opp_cd=row['dup_opp_cd'], - dup_inst_name_kanji=row['dup_inst_name_kanji'] - ) - ) - + add_dct_inst_list.append(add_dct_inst.format(**row)) add_dct_inst_list = '\n'.join(add_dct_inst_list) + logger.info( f"""[NOTICE]DCF施設統合マスタが追加されました。 ********************************************************** -適用月度{setYearMonth} +適用月度　{setYearMonth} ********************************************************** {add_dct_inst_list} ********************************************************** -合計　{len(result)}件 - """ +合計　{len(result)}件""" ) return From 300420031c64fdedcc27ed9f41527841e3e8cc1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= Date: Thu, 11 May 2023 17:50:11 +0900 Subject: [PATCH 4/7] =?UTF-8?q?feat:=20=E3=83=AC=E3=83=93=E3=83=A5?= =?UTF-8?q?=E3=83=BC=E6=8C=87=E6=91=98=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dcf_inst_merge/create_dcf_inst_merge.py | 70 +++++++++---------- ecs/jskult-batch-daily/src/jobctrl_daily.py | 3 +- 2 files changed, 37 insertions(+), 36 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py b/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py index de00baea..c7f10b9f 100644 --- a/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py +++ b/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py @@ -22,10 +22,11 @@ def exec(): db.begin() logger.debug('DCF施設統合マスタ作成処理開始') # COM施設からDCF施設統合マスタに登録 - (is_add_dcf_inst, result) = _insert_dcf_inst_merge_from_com_ci(db) - # DCF施設統合マスタの追加のログを出力する - if is_add_dcf_inst: - _output_add_dcf_inst_log(result) + (is_add_dcf_inst_merge, duplication_inst_records) = _insert_dcf_inst_merge_from_com_inst(db) + # DCF施設統合マスタ追加のログを出力する + if is_add_dcf_inst_merge: + logger.info('[NOTICE]DCF施設統合マスタが追加されました。') + _output_add_dcf_inst_merge_log(duplication_inst_records) logger.debug('DCF施設統合マスタ作成処理終了') except Exception as e: db.rollback() @@ -34,8 +35,8 @@ def exec(): db.disconnect() -def _insert_dcf_inst_merge_from_com_ci(db: Database) -> tuple[bool, list[dict]]: - # com_ciからdcf_inst_mergeにinsert +def _insert_dcf_inst_merge_from_com_inst(db: Database) -> tuple[bool, list[dict]]: + # com_instからdcf_inst_mergeにinsert # 重複コードがあるデータを取得する(処理日～システム日付を対象) try: sql = """ @@ -51,14 +52,14 @@ def _insert_dcf_inst_merge_from_com_ci(db: Database) -> tuple[bool, list[dict]]: WHERE dupci.dcf_dsf_inst_cd = ci.dup_opp_cd ) AS dup_inst_name_kanji, - DATE_FORMAT(DATE_ADD((SELECT syor_date FROM src05.hdke_tbl),INTERVAL 1 MONTH),'%Y%m') AS sys_update_date + DATE_FORMAT((src05.get_syor_date() + INTERVAL 1 MONTH), '%Y%m') AS sys_update_date FROM src05.com_inst AS ci WHERE CHAR_LENGTH(ci.dup_opp_cd) > 0 AND ci.delete_sche_reason_cd = 'D' AND ci.abolish_ymd IS NULL - AND DATE_FORMAT(ci.sys_update_date, '%Y%m%d') BETWEEN (SELECT syor_date FROM src05.hdke_tbl) AND DATE_FORMAT(SYSDATE(), '%Y%m%d') + AND ci.sys_update_date BETWEEN src05.get_syor_date() AND SYSDATE() AND NOT EXISTS ( SELECT dim.dcf_inst_cd @@ -86,31 +87,29 @@ def _insert_dcf_inst_merge_from_com_ci(db: Database) -> tuple[bool, list[dict]]: ) ) """ - result = db.execute_select(sql) + duplication_inst_records = db.execute_select(sql) logging_sql(logger, sql) logger.info('重複コードがあるデータの取得に成功') except Exception as e: logger.debug('重複コードがあるデータの取得に失敗') raise e - if len(result) == 0: + if len(duplication_inst_records) == 0: logger.info('重複コードがあるデータはありません') - return False, None + return (False, None) # DCF施設統合マスタ追加 values_clauses = [] params = {} - clauses_no = 1 - for row in result: - dcfInstCdArr = f'dcfInstCd{clauses_no}' - dupOppCdArr = f'dupOppCd{clauses_no}' - tekiyoMonthArr = f'tekiyoMonth{clauses_no}' - placeholders = f'(:{dcfInstCdArr}, :{dupOppCdArr}, :{tekiyoMonthArr}, "Y", CURRENT_USER(), SYSDATE(), CURRENT_USER(), SYSDATE())' - values_clauses.append(placeholders) - params[dcfInstCdArr] = row['dcf_dsf_inst_cd'] - params[dupOppCdArr] = row['dup_opp_cd'] - params[tekiyoMonthArr] = row['sys_update_date'] - clauses_no += 1 + for clauses_no, row in enumerate(duplication_inst_records, start=1): + dcf_inst_cd_arr = f'dcf_inst_cd{clauses_no}' + dup_opp_cd_arr = f'dup_opp_cd{clauses_no}' + tekiyo_month_arr = f'tekiyo_month{clauses_no}' + values_clause = f'(:{dcf_inst_cd_arr}, :{dup_opp_cd_arr}, :{tekiyo_month_arr}, "Y", CURRENT_USER(), SYSDATE(), CURRENT_USER(), SYSDATE())' + values_clauses.append(values_clause) + params[dcf_inst_cd_arr] = row['dcf_dsf_inst_cd'] + params[dup_opp_cd_arr] = row['dup_opp_cd'] + params[tekiyo_month_arr] = row['sys_update_date'] insert_sql = f""" INSERT INTO @@ -137,29 +136,30 @@ def _insert_dcf_inst_merge_from_com_ci(db: Database) -> tuple[bool, list[dict]]: logger.debug('COM施設からDCF施設統合マスタの登録に失敗') raise e - return (True, result) + return (True, duplication_inst_records) -def _output_add_dcf_inst_log(result: list[dict]): - sys_update_date = result[0]['sys_update_date'] - setYearMonth = '{set_year}年{set_month}月'.format( +def _output_add_dcf_inst_merge_log(duplication_inst_records: list[dict]): + sys_update_date = duplication_inst_records[0]['sys_update_date'] + set_year_month = '{set_year}年{set_month}月'.format( set_year=sys_update_date[0:4], set_month=sys_update_date[-2:] ) - add_dct_inst = 'DCF施設コード　{dcf_dsf_inst_cd}　{form_inst_name_kanji}, 　重複時相手先コード　{dup_opp_cd}　{dup_inst_name_kanji}' - add_dct_inst_list = [] - for row in result: - add_dct_inst_list.append(add_dct_inst.format(**row)) - add_dct_inst_list = '\n'.join(add_dct_inst_list) + add_dct_inst_merge = 'DCF施設コード　{dcf_dsf_inst_cd}　{form_inst_name_kanji}, 　重複時相手先コード　{dup_opp_cd}　{dup_inst_name_kanji}' + add_dct_inst_merge_list = [] + for row in duplication_inst_records: + add_dct_inst_merge_list.append(add_dct_inst_merge.format(**row)) + add_dct_inst_merge_list = '\n'.join(add_dct_inst_merge_list) + # 顧客報告用にログ出力 logger.info( - f"""[NOTICE]DCF施設統合マスタが追加されました。 + f"""DCF施設統合マスタが追加されました。 ********************************************************** -適用月度　{setYearMonth} +適用月度　{set_year_month} ********************************************************** -{add_dct_inst_list} +{add_dct_inst_merge_list} ********************************************************** -合計　{len(result)}件""" +合計　{len(duplication_inst_records)}件""" ) return diff --git a/ecs/jskult-batch-daily/src/jobctrl_daily.py b/ecs/jskult-batch-daily/src/jobctrl_daily.py index 370f2179..cb1cf9e1 100644 --- a/ecs/jskult-batch-daily/src/jobctrl_daily.py +++ b/ecs/jskult-batch-daily/src/jobctrl_daily.py @@ -7,7 +7,8 @@ from src.batch.batch_functions import ( update_batch_processing_flag_in_processing) from src.batch.common.batch_context import BatchContext from src.batch.common.calendar_file import CalendarFile -from src.batch.laundering import create_dcf_inst_merge, create_mst_inst +from src.batch.dcf_inst_merge import create_dcf_inst_merge +from src.batch.laundering import create_mst_inst from src.batch.ultmarc import ultmarc_process from src.error.exceptions import BatchOperationException from src.logging.get_logger import get_logger From 35c68957b076a8ffccba8f6bc2b1b1d9eccf0207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= Date: Fri, 12 May 2023 10:14:24 +0900 Subject: [PATCH 5/7] =?UTF-8?q?feat:=20=E5=AE=9F=E8=A1=8C=E6=99=82?= =?UTF-8?q?=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=8C=E5=87=BA=E3=82=8B=E4=B8=8D?= =?UTF-8?q?=E5=85=B7=E5=90=88=E3=81=AE=E5=AF=BE=E5=87=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-batch-daily/src/jobctrl_daily.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecs/jskult-batch-daily/src/jobctrl_daily.py b/ecs/jskult-batch-daily/src/jobctrl_daily.py index 2614ab22..a98c0d16 100644 --- a/ecs/jskult-batch-daily/src/jobctrl_daily.py +++ b/ecs/jskult-batch-daily/src/jobctrl_daily.py @@ -8,7 +8,7 @@ from src.batch.batch_functions import ( 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 mst_inst_laundering +from src.batch.laundering import mst_inst_laundering from src.batch.ultmarc import ultmarc_process from src.error.exceptions import BatchOperationException from src.logging.get_logger import get_logger From 2eae9fa25af235b77be0710c977249775659a690 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= Date: Mon, 15 May 2023 11:40:39 +0900 Subject: [PATCH 6/7] =?UTF-8?q?feat:=20=E5=8D=98=E4=BD=93=E8=A9=A6?= =?UTF-8?q?=E9=A8=93=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 --- .../src/batch/dcf_inst_merge/create_dcf_inst_merge.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py b/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py index c7f10b9f..bbeb86d3 100644 --- a/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py +++ b/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py @@ -15,6 +15,7 @@ def exec(): # アルトマーク取込が行われていない場合は処理をスキップする if not batch_context.is_ultmarc_imported: logger.info('アルトマーク取込が行われていないため、DCF施設統合マスタ作成処理をスキップします。') + return db = Database.get_instance() try: From a0698a425de25537f37c21ac4a0ad30bd710dc8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= Date: Tue, 16 May 2023 14:26:37 +0900 Subject: [PATCH 7/7] =?UTF-8?q?feat:=20=E5=8D=98=E4=BD=93=E8=A9=A6?= =?UTF-8?q?=E9=A8=93=E3=83=AC=E3=83=93=E3=83=A5=E3=83=BC=E6=8C=87=E6=91=98?= =?UTF-8?q?=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/batch/dcf_inst_merge/create_dcf_inst_merge.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py b/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py index bbeb86d3..0dad2288 100644 --- a/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py +++ b/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py @@ -90,13 +90,13 @@ def _insert_dcf_inst_merge_from_com_inst(db: Database) -> tuple[bool, list[dict] """ duplication_inst_records = db.execute_select(sql) logging_sql(logger, sql) - logger.info('重複コードがあるデータの取得に成功') + logger.info('施設統合対象データの取得に成功') except Exception as e: - logger.debug('重複コードがあるデータの取得に失敗') + logger.debug('施設統合対象データの取得に失敗') raise e if len(duplication_inst_records) == 0: - logger.info('重複コードがあるデータはありません') + logger.info('施設統合対象データはありません') return (False, None) # DCF施設統合マスタ追加