From 64c81784604ed803733de3087a7005859b7c3305 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Mon, 9 Jun 2025 17:59:18 +0900 Subject: [PATCH] =?UTF-8?q?format:=20=E6=9C=AA=E4=BD=BF=E7=94=A8=E3=81=AEi?= =?UTF-8?q?mport=E3=81=A8=E5=A4=89=E6=95=B0=E3=82=92=E5=89=8A=E9=99=A4?= =?UTF-8?q?=E3=80=82=E3=83=95=E3=82=A9=E3=83=BC=E3=83=9E=E3=83=83=E3=83=88?= =?UTF-8?q?=E9=81=A9=E7=94=A8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-batch/src/batch/mst_inst_all.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/ecs/jskult-batch/src/batch/mst_inst_all.py b/ecs/jskult-batch/src/batch/mst_inst_all.py index 8348d97a..aad86fc4 100644 --- a/ecs/jskult-batch/src/batch/mst_inst_all.py +++ b/ecs/jskult-batch/src/batch/mst_inst_all.py @@ -1,9 +1,6 @@ -import csv import json -import os.path as path -import tempfile -from src.aws.s3 import JskSendBucket, JskTransferListBucket +from src.aws.s3 import JskTransferListBucket from src.batch.environment.mst_inst_all_environment import \ MstInstAllEnvironment from src.batch.jskult_batch_entrypoint import JskultBatchEntrypoint @@ -15,7 +12,6 @@ from src.logging.get_logger import get_logger from src.manager.jskult_batch_run_manager import JskultBatchRunManager from src.manager.jskult_batch_status_manager import JskultBatchStatusManager from src.manager.jskult_hdke_tbl_manager import JskultHdkeTblManager -from src.system_var import environment from src.system_var import constants logger = get_logger('メルク施設マスタ作成') @@ -198,7 +194,7 @@ class MstInstAll(JskultBatchEntrypoint): LEFT OUTER JOIN src05.com_inst_div AS cid ON ci.inst_div_cd = cid.inst_div_cd """ - res = db.execute(sql) + db.execute(sql) logger.info("COM_施設からメルク施設マスタに登録成功") except Exception as e: logger.info("COM_施設からメルク施設マスタに登録失敗") @@ -270,7 +266,7 @@ class MstInstAll(JskultBatchEntrypoint): LEFT OUTER JOIN src05.com_inst_div AS cid ON cp.inst_div_cd = cid.inst_div_cd """ - res = db.execute(sql) + db.execute(sql) logger.info("COM_薬局からメルク施設マスタに登録成功") except Exception as e: logger.info("COM_薬局からメルク施設マスタに登録失敗") @@ -343,16 +339,16 @@ class MstInstAll(JskultBatchEntrypoint): FROM src07.mst_inst_merck AS mim GROUP BY mim.inst_cd ) AS mim_max_end_ym - ON mim.inst_cd = mim_max_end_ym.inst_cd + ON mim.inst_cd = mim_max_end_ym.inst_cd AND mim.eff_end_ym = mim_max_end_ym.max_end_ym LEFT OUTER JOIN src07.mst_jis_pref AS mjp ON mim.jis_pref_cd = mjp.jis_pref_cd LEFT OUTER JOIN src07.mst_jis_city AS mjc ON mim.jis_pref_cd = mjc.jis_pref_cd AND mim.jis_city_cd = mjc.jis_city_cd; - + """ - res = db.execute(sql) + db.execute(sql) logger.info("メルク独自施設マスタからメルク施設マスタに登録成功") except Exception as e: logger.info("メルク独自施設マスタからメルク施設マスタに登録失敗")