From 0142c2658ea8851196db278733ca9b38ab1ff5cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= Date: Fri, 21 Apr 2023 15:34:11 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=E3=83=AC=E3=83=93=E3=83=A5=E3=83=BC?= =?UTF-8?q?=E6=8C=87=E6=91=98=E5=AF=BE=E5=BF=9C=E3=80=81=E3=82=AB=E3=83=A9?= =?UTF-8?q?=E3=83=A0=E5=90=8D=E5=A4=89=E6=9B=B4=E3=81=AA=E3=81=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laundering/emp_chg_inst_laundering.py | 34 ++++++++----------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/laundering/emp_chg_inst_laundering.py b/ecs/jskult-batch-daily/src/batch/laundering/emp_chg_inst_laundering.py index aabf4e10..dc596f60 100644 --- a/ecs/jskult-batch-daily/src/batch/laundering/emp_chg_inst_laundering.py +++ b/ecs/jskult-batch-daily/src/batch/laundering/emp_chg_inst_laundering.py @@ -15,16 +15,14 @@ def exec(): db.connect() logger.debug('##########################') logger.debug('START Changing Employee in charge of institution PGM.') - # 業務日付を取得 - syor_date = batch_context.syor_date # `emp_chg_inst_lau`をTruncate _truncate_emp_chg_inst_lau(db) # emp_chg_inst から、`emp_chg_inst_lau`へInsert _insert_into_emp_chg_inst_lau_from_emp_chg_inst(db) # v_inst_merge_tから、emp_chg_inst_lauをUpdate - _update_emp_chg_inst_lau_from_v_inst_merge_t(db, syor_date) - # v_inst_merge_tから、emp_chg_inst_lauをUpdate - _update_v_inst_merge_t_from_emp_chg_inst_lau(db, syor_date) + _update_emp_chg_inst_lau_from_v_inst_merge_t(db) + # inst_merge_tから、emp_chg_inst_lauをUpdate + _update_emp_chg_inst_lau_from_inst_merge_t(db) logger.debug('##########################') logger.debug('End All Processing PGM.') except Exception as e: @@ -81,8 +79,8 @@ def _insert_into_emp_chg_inst_lau_from_emp_chg_inst(db: Database): return -def _update_emp_chg_inst_lau_from_v_inst_merge_t(db: Database, syor_date: str): - # v_inst_merge_tはデータが作られないため、この洗い替え処理は基本空振りする +def _update_emp_chg_inst_lau_from_v_inst_merge_t(db: Database): + # v_inst_merge_tの元となるvop_hco_merge_vはデータが作られないため、この洗い替え処理は基本空振りする logger.debug("##########################") try: select_result = db.execute_select( @@ -107,30 +105,28 @@ def _update_emp_chg_inst_lau_from_v_inst_merge_t(db: Database, syor_date: str): """ SELECT v_inst_cd, - v_inst_cd_merg + v_inst_cd_merge FROM internal05.v_inst_merge_t - ORDER BY - STR_TO_DATE(apply_dt, '%Y-%m-%d') ASC """ ) for row in result: v_inst_cd = row['v_inst_cd'] - v_inst_cd_merge = row['v_inst_cd_merg'] + v_inst_cd_merge = row['v_inst_cd_merge'] try: elapsed_time = ElapsedTime() update_sql = """ UPDATE emp_chg_inst_lau SET - inst_cd = :v_inst_merge, + inst_cd = :v_inst_cd_merge, lua_ope_dt = SYSDATE() WHERE inst_cd = :v_inst_cd; """ update_result = db.execute( update_sql, - {'v_inst_cd': v_inst_cd, 'v_inst_cd_merg': v_inst_cd_merge} + {'v_inst_cd': v_inst_cd, 'v_inst_cd_merge': v_inst_cd_merge} ) logging_sql(logger, update_sql) logger.info(f'Query OK, {update_result.rowcount} rows affected ({elapsed_time.of})') @@ -141,7 +137,7 @@ def _update_emp_chg_inst_lau_from_v_inst_merge_t(db: Database, syor_date: str): return -def _update_v_inst_merge_t_from_emp_chg_inst_lau(db: Database, syor_date: str): +def _update_emp_chg_inst_lau_from_inst_merge_t(db: Database): # inst_merge_tから、emp_chg_inst_lauをUpdate # Get count from INST_MERGE_T logger.debug("##########################") @@ -149,7 +145,7 @@ def _update_v_inst_merge_t_from_emp_chg_inst_lau(db: Database, syor_date: str): select_result = db.execute_select( """ SELECT - COUNT(dcf_inst_cd) AS row_count + COUNT(dcf_dsf_inst_cd) AS row_count FROM internal05.inst_merge_t """ @@ -174,14 +170,12 @@ def _update_v_inst_merge_t_from_emp_chg_inst_lau(db: Database, syor_date: str): UPDATE src05.emp_chg_inst_lau el, internal05.inst_merge_t imt SET - el.inst_cd = imt.dcf_inst_cd_new, + el.inst_cd = imt.dup_opp_cd, el.lua_ope_dt = SYSDATE() WHERE - el.inst_cd = imt.dcf_inst_cd + el.inst_cd = imt.dcf_dsf_inst_cd """ - res = db.execute( - update_sql - ) + res = db.execute(update_sql) logging_sql(logger, update_sql) logger.info(f'Query OK, {res.rowcount} rows affected ({elapsed_time.of})') except Exception as e: