From 28d8fe11339024d59c2ad263ede06ff38b12bacc Mon Sep 17 00:00:00 2001 From: "mori.k" Date: Tue, 17 Jun 2025 13:59:30 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=E5=87=BA=E5=8A=9Bcsv=E3=81=8B=E3=82=89?= =?UTF-8?q?=E7=A7=BB=E8=A1=8C=E5=85=88DCF=E6=96=BD=E8=A8=AD=E3=82=B3?= =?UTF-8?q?=E3=83=BC=E3=83=89=E3=82=92=E9=99=A4=E5=A4=96=E3=81=97=E3=80=81?= =?UTF-8?q?=E5=80=A4=E5=9B=B2=E3=81=84=E3=81=AA=E3=81=97=E3=81=AB=E5=A4=89?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/batch/dcf_inst_merge_io.py | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/ecs/jskult-batch/src/batch/dcf_inst_merge_io.py b/ecs/jskult-batch/src/batch/dcf_inst_merge_io.py index 06b28023..5aad9b7d 100644 --- a/ecs/jskult-batch/src/batch/dcf_inst_merge_io.py +++ b/ecs/jskult-batch/src/batch/dcf_inst_merge_io.py @@ -288,7 +288,17 @@ class DcfInstMergeIO(JskultBatchEntrypoint): try: sql = """\ SELECT - * + DCF_INST_CD, + DUP_OPP_CD, + START_MONTH, + INVALID_FLG, + REMARKS, + ENABLED_FLG, + CREATER, + CREATE_DATE, + UPDATER, + UPDATE_DATE + FROM src07.dcf_inst_merge """ @@ -301,17 +311,16 @@ class DcfInstMergeIO(JskultBatchEntrypoint): temporary_dir = tempfile.mkdtemp() csv_file_path = path.join(temporary_dir, csv_file_name) head_str = ['DCF_INST_CD', 'DUP_OPP_CD', 'START_MONTH', - 'INVALID_FLG', 'REMARKS', 'DCF_INST_CD_NEW', 'ENABLED_FLG', + 'INVALID_FLG', 'REMARKS', 'ENABLED_FLG', 'CREATER', 'CREATE_DATE', 'UPDATER', 'UPDATE_DATE'] with open(csv_file_path, mode='w', encoding='UTF-8') as csv_file: - # ヘッダ行書き込み（くくり文字をつけない為にwriterowではなく、writeを使用しています） - csv_file.write(f"{','.join(head_str)}\r\n") - # UTF-8、CRLF、価囲いありで書き込む + # UTF-8、CRLF、価囲いなしで書き込む writer = csv.writer(csv_file, delimiter=',', lineterminator='\r\n', - quotechar='"', doublequote=True, quoting=csv.QUOTE_ALL, + quoting=csv.QUOTE_NONE, strict=True ) - # データ部分書き込み(施設) + writer.writerow(head_str) + # データ部分書き込み for record_inst_data in record_inst: record_inst_value = list(record_inst_data.values()) csv_data = [ From 50c0ea95b36233b4d9feee66638e0d935ee74ed7 Mon Sep 17 00:00:00 2001 From: "mori.k" Date: Tue, 17 Jun 2025 14:30:10 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=9F=E6=85=8B=E3=81=AB=E5=90=88?= =?UTF-8?q?=E3=82=8F=E3=81=9B=E3=81=9F=E3=83=A1=E3=82=BD=E3=83=83=E3=83=89?= =?UTF-8?q?=E5=90=8D=E3=81=A8=E5=A4=89=E6=95=B0=E5=90=8D=E3=81=AE=E3=83=AA?= =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=AF=E3=82=BF=E3=83=AA=E3=83=B3=E3=82=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-batch/src/batch/dcf_inst_merge_io.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ecs/jskult-batch/src/batch/dcf_inst_merge_io.py b/ecs/jskult-batch/src/batch/dcf_inst_merge_io.py index 5aad9b7d..1297ae71 100644 --- a/ecs/jskult-batch/src/batch/dcf_inst_merge_io.py +++ b/ecs/jskult-batch/src/batch/dcf_inst_merge_io.py @@ -115,10 +115,10 @@ class DcfInstMergeIO(JskultBatchEntrypoint): # DCF施設削除新規マスタ出力 logger.info('DCF施設削除新規マスタ出力を開始します。') - dcf_inst_merge_all_records = self._select_dcf_inst_merge_all(db) + dcf_inst_merge_records = self._select_dcf_inst_merge(db) file_path = self._make_csv_data( self.environment.DCF_INST_MERGE_SEND_FILE_NAME, - dcf_inst_merge_all_records) + dcf_inst_merge_records) # CSVをS3にアップロード self._upload_dcf_inst_merge_csv_file( @@ -284,7 +284,7 @@ class DcfInstMergeIO(JskultBatchEntrypoint): return - def _select_dcf_inst_merge_all(self, db: Database) -> tuple[bool, list[dict]]: + def _select_dcf_inst_merge(self, db: Database) -> tuple[bool, list[dict]]: try: sql = """\ SELECT @@ -302,8 +302,8 @@ class DcfInstMergeIO(JskultBatchEntrypoint): FROM src07.dcf_inst_merge """ - dcf_inst_merge_all_records = db.execute_select(sql) - return dcf_inst_merge_all_records + dcf_inst_merge_records = db.execute_select(sql) + return dcf_inst_merge_records except Exception as e: raise BatchOperationException(e) From 691831742b6d62d8f2b5db2d3af4580673231e73 Mon Sep 17 00:00:00 2001 From: "mori.k" Date: Tue, 17 Jun 2025 15:58:39 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A4=A7=E6=96=87=E5=AD=97=E3=82=92?= =?UTF-8?q?=E5=B0=8F=E6=96=87=E5=AD=97=E3=81=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/batch/dcf_inst_merge_io.py | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ecs/jskult-batch/src/batch/dcf_inst_merge_io.py b/ecs/jskult-batch/src/batch/dcf_inst_merge_io.py index 1297ae71..6f2a11d3 100644 --- a/ecs/jskult-batch/src/batch/dcf_inst_merge_io.py +++ b/ecs/jskult-batch/src/batch/dcf_inst_merge_io.py @@ -288,16 +288,16 @@ class DcfInstMergeIO(JskultBatchEntrypoint): try: sql = """\ SELECT - DCF_INST_CD, - DUP_OPP_CD, - START_MONTH, - INVALID_FLG, - REMARKS, - ENABLED_FLG, - CREATER, - CREATE_DATE, - UPDATER, - UPDATE_DATE + dcf_inst_cd, + dup_opp_cd, + start_month, + invalid_flg, + remarks, + enabled_flg, + creater, + create_date, + updater, + update_date FROM src07.dcf_inst_merge