nik/newdwh2021
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #271 feature-NEWDWH2021-1230 into develop

Browse Source
This commit is contained in:
下田雅人 2023-09-16 09:09:04 +09:00
commit cc78327472
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ecs/jskult-batch-daily/src/batch/laundering/sales_results_laundering.py
View File

@ -45,6 +45,7 @@ def _call_sales_lau_delete(db: Database):
def _call_sales_lau_upsert(db: Database):
# 卸販売実績テーブル（洗替後）作成
# sales_lau_upsertの第3引数は、NEWDWH2021-1230の対応の結果、未使用の引数となっています
logger.info('sales_lau_upsert(プロシージャ―) 開始')
db.execute(f"""
CALL src05.sales_lau_upsert(

1
ecs/jskult-batch-laundering/src/batch/laundering/sales_results_laundering.py
View File

@ -31,6 +31,7 @@ def exec():
def _call_sales_lau_upsert(db: Database):
# 卸販売実績テーブル（洗替後）作成
# sales_lau_upsertの第3引数は、NEWDWH2021-1230の対応の結果、未使用の引数となっています
logger.info('sales_lau_upsert(プロシージャ―) 開始')
db.execute(f"""
CALL src05.sales_lau_upsert(

16
rds_mysql/stored_procedure/src05/sales_lau_upsert.sql
View File

@ -1,4 +1,5 @@
-- A5M2で実行時に[SQL] - [スラッシュ(/)のみの行でSQLを区切る]に変えてから実行する
-- extract_to_dateは、NEWDWH2021-1230の対応の結果、未使用の引数となっています
CREATE PROCEDURE src05.sales_lau_upsert(target_table VARCHAR(255), extract_from_date DATE,
extract_to_date DATE)
SQL SECURITY INVOKER
@ -145,7 +146,6 @@ BEGIN
);
SET @extract_from_datetime = CAST(extract_from_date AS DATETIME);
SET @extract_to_datetime = ADDTIME(CAST(extract_to_date AS DATETIME), '23:59:59');
SET @upsert_sales_launderning = "
INSERT INTO
@ -334,11 +334,10 @@ BEGIN
SYSDATE()
FROM (
SELECT
? AS extract_from_datetime,
? AS extract_to_datetime
? AS extract_from_datetime
) AS sub
INNER JOIN src05.sales AS s
ON s.dwh_upd_dt BETWEEN sub.extract_from_datetime AND sub.extract_to_datetime
ON s.dwh_upd_dt >= sub.extract_from_datetime
LEFT OUTER JOIN src05.phm_prd_mst_v AS ppmv
ON s.comm_cd = ppmv.prd_cd
AND STR_TO_DATE(s.hsdn_ymd,'%Y%m%d') BETWEEN ppmv.start_date AND ppmv.end_date
@ -435,7 +434,7 @@ BEGIN
";
SET @upsert_sales_launderning = REPLACE(@upsert_sales_launderning, "$$target_table$$", target_table);
PREPARE upsert_sales_launderning_stmt from @upsert_sales_launderning;
EXECUTE upsert_sales_launderning_stmt USING @extract_from_datetime, @extract_to_datetime;
EXECUTE upsert_sales_launderning_stmt USING @extract_from_datetime;
CALL medaca_common.put_info_log(schema_name, procedure_name, procedure_args,
'卸販売実績テーブル（洗替後）作成⑤ 終了'
@ -448,8 +447,7 @@ BEGIN
SET @update_institution_code = "
UPDATE (
SELECT
? AS extract_from_datetime,
? AS extract_to_datetime
? AS extract_from_datetime
) AS sub,
$$target_table$$ AS tt,
src05.sales AS s
@ -465,13 +463,13 @@ BEGIN
END
)
WHERE
s.dwh_upd_dt BETWEEN sub.extract_from_datetime AND sub.extract_to_datetime
s.dwh_upd_dt >= sub.extract_from_datetime
AND tt.slip_mgt_num = s.slip_mgt_num
AND tt.row_num = s.row_num
";
SET @update_institution_code = REPLACE(@update_institution_code, "$$target_table$$", target_table);
PREPARE update_institution_code_stmt from @update_institution_code;
EXECUTE update_institution_code_stmt USING @extract_from_datetime, @extract_to_datetime;
EXECUTE update_institution_code_stmt USING @extract_from_datetime;
CALL medaca_common.put_info_log(schema_name, procedure_name, procedure_args,
'卸販売実績テーブル（洗替後）作成⑥ 終了'