From fb29466a4a5f40fb947d92e48cfe3c33fc44ef0f Mon Sep 17 00:00:00 2001 From: "nik.n" Date: Thu, 7 Mar 2024 14:20:57 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=E3=83=A1=E3=83=AB=E3=82=AF=E6=96=BD?= =?UTF-8?q?=E8=A8=AD=E3=83=9E=E3=82=B9=E3=82=BF=E4=BD=9C=E6=88=90=E3=83=97?= =?UTF-8?q?=E3=83=AD=E3=82=B0=E3=83=A9=E3=83=A0=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/batch/laundering/mst_inst_laundering.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ecs/jskult-batch-daily/src/batch/laundering/mst_inst_laundering.py b/ecs/jskult-batch-daily/src/batch/laundering/mst_inst_laundering.py index bbaa5fd0..585a261d 100644 --- a/ecs/jskult-batch-daily/src/batch/laundering/mst_inst_laundering.py +++ b/ecs/jskult-batch-daily/src/batch/laundering/mst_inst_laundering.py @@ -86,7 +86,14 @@ def _insert_mst_inst_from_fcl_mst_v(db: Database): END AS address, fmv1.postal_cd, fmv1.tel_num, - LEFT(fmv1.closed_dt, 10), + CASE + WHEN + fmv1.fcl_type IN ('20') THEN LEFT(fmv1.closed_dt, 10) + WHEN + fmv1.fcl_type IN ('A1', 'A0') AND fmv1.closed_dt != '9999-12-31' THEN LEFT(fmv1.closed_dt, 10) + ELSE + null + END, fmv1.v_inst_cd, fmv1.ins_dt, fmv1.upd_dt From 6ecb2b0f0cddd9564e47a9586ff2b94cbff693b6 Mon Sep 17 00:00:00 2001 From: "nik.n" Date: Thu, 7 Mar 2024 16:46:42 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=E6=8A=BD=E5=87=BA=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/batch/laundering/mst_inst_laundering.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/laundering/mst_inst_laundering.py b/ecs/jskult-batch-daily/src/batch/laundering/mst_inst_laundering.py index 585a261d..527f0e02 100644 --- a/ecs/jskult-batch-daily/src/batch/laundering/mst_inst_laundering.py +++ b/ecs/jskult-batch-daily/src/batch/laundering/mst_inst_laundering.py @@ -87,13 +87,13 @@ def _insert_mst_inst_from_fcl_mst_v(db: Database): fmv1.postal_cd, fmv1.tel_num, CASE - WHEN - fmv1.fcl_type IN ('20') THEN LEFT(fmv1.closed_dt, 10) - WHEN - fmv1.fcl_type IN ('A1', 'A0') AND fmv1.closed_dt != '9999-12-31' THEN LEFT(fmv1.closed_dt, 10) - ELSE - null - END, + WHEN + fmv1.fcl_type BETWEEN '20' AND '29' THEN LEFT(fmv1.closed_dt, 10) + WHEN + fmv1.fcl_type IN ('A1', 'A0') AND fmv1.end_date != '9999-12-31' THEN fmv1.end_date + ELSE + null + END, fmv1.v_inst_cd, fmv1.ins_dt, fmv1.upd_dt From 7b7ff612f5a9cd792e73c6671cdd23fda64671d0 Mon Sep 17 00:00:00 2001 From: "nik.n" Date: Thu, 7 Mar 2024 17:28:00 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=E6=97=A5=E4=BB=98=E3=83=95=E3=82=A9?= =?UTF-8?q?=E3=83=BC=E3=83=9E=E3=83=83=E3=83=88=E6=BC=8F=E3=82=8C=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E3=83=BBAS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/batch/laundering/mst_inst_laundering.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/laundering/mst_inst_laundering.py b/ecs/jskult-batch-daily/src/batch/laundering/mst_inst_laundering.py index 527f0e02..e39c5da9 100644 --- a/ecs/jskult-batch-daily/src/batch/laundering/mst_inst_laundering.py +++ b/ecs/jskult-batch-daily/src/batch/laundering/mst_inst_laundering.py @@ -88,12 +88,12 @@ def _insert_mst_inst_from_fcl_mst_v(db: Database): fmv1.tel_num, CASE WHEN - fmv1.fcl_type BETWEEN '20' AND '29' THEN LEFT(fmv1.closed_dt, 10) + fmv1.fcl_type BETWEEN '20' AND '29' THEN DATE_FORMAT(LEFT(fmv1.closed_dt, 10), "%Y%m%d") WHEN - fmv1.fcl_type IN ('A1', 'A0') AND fmv1.end_date != '9999-12-31' THEN fmv1.end_date + fmv1.fcl_type IN ('A1', 'A0') AND fmv1.end_date != '9999-12-31' THEN DATE_FORMAT(fmv1.end_date, "%Y%m%d") ELSE null - END, + END AS delete_date, fmv1.v_inst_cd, fmv1.ins_dt, fmv1.upd_dt From 261553880710bcac80bd1f51809cbee4db7e00d0 Mon Sep 17 00:00:00 2001 From: "nik.n" Date: Fri, 8 Mar 2024 09:32:03 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=E6=97=A5=E4=BB=98=E3=83=95=E3=82=A9?= =?UTF-8?q?=E3=83=BC=E3=83=9E=E3=83=83=E3=83=88=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/batch/laundering/mst_inst_laundering.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/laundering/mst_inst_laundering.py b/ecs/jskult-batch-daily/src/batch/laundering/mst_inst_laundering.py index e39c5da9..783b7db2 100644 --- a/ecs/jskult-batch-daily/src/batch/laundering/mst_inst_laundering.py +++ b/ecs/jskult-batch-daily/src/batch/laundering/mst_inst_laundering.py @@ -88,9 +88,9 @@ def _insert_mst_inst_from_fcl_mst_v(db: Database): fmv1.tel_num, CASE WHEN - fmv1.fcl_type BETWEEN '20' AND '29' THEN DATE_FORMAT(LEFT(fmv1.closed_dt, 10), "%Y%m%d") + fmv1.fcl_type BETWEEN '20' AND '29' THEN LEFT(fmv1.closed_dt, 10) WHEN - fmv1.fcl_type IN ('A1', 'A0') AND fmv1.end_date != '9999-12-31' THEN DATE_FORMAT(fmv1.end_date, "%Y%m%d") + fmv1.fcl_type IN ('A1', 'A0') AND fmv1.end_date != '9999-12-31' THEN DATE_FORMAT(fmv1.end_date, "%Y-%m-%d") ELSE null END AS delete_date,