From 28d8fe11339024d59c2ad263ede06ff38b12bacc Mon Sep 17 00:00:00 2001
From: "mori.k" <mori.k@nds-tyo.co.jp>
Date: Tue, 17 Jun 2025 13:59:30 +0900
Subject: [PATCH] =?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 = [