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

feat: レビュー指摘対応

Browse Source
This commit is contained in:
高木要 2023-04-12 15:15:15 +09:00
parent 284f36f801
commit 4e97b0b38e
2 changed files with 24 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rds_mysql/stored_procedure/inst_merge_t_create.sql
View File

@ -3,7 +3,6 @@ CREATE PROCEDURE src05.inst_merge_t_create()
SQL SECURITY INVOKER SQL SECURITY INVOKER
BEGIN BEGIN
-- 例外処理 -- 例外処理
-- エラーが発生した場合に一時テーブルの削除を実施
DECLARE EXIT HANDLER FOR SQLEXCEPTION DECLARE EXIT HANDLER FOR SQLEXCEPTION
BEGIN BEGIN
GET DIAGNOSTICS CONDITION 1 GET DIAGNOSTICS CONDITION 1
@ -14,7 +13,6 @@ BEGIN
END; END;
SET @error_state = NULL, @error_msg = NULL; SET @error_state = NULL, @error_msg = NULL;
START TRANSACTION;
TRUNCATE TABLE internal05.inst_merge_t; TRUNCATE TABLE internal05.inst_merge_t;
@ -28,21 +26,20 @@ BEGIN
prefc_cd prefc_cd
) )
SELECT SELECT
di.dcf_inst_cd, dim.dcf_inst_cd,
di.dcf_inst_cd_new, dim.dcf_inst_cd_new,
ci.form_inst_name_kanji, ci.form_inst_name_kanji,
ci.form_inst_name_kana, ci.form_inst_name_kana,
ci.inst_addr, ci.inst_addr,
ci.prefc_cd ci.prefc_cd
FROM FROM
dcf_inst_merge di src05.dcf_inst_merge dim
LEFT OUTER JOIN com_inst ci LEFT OUTER JOIN src05.com_inst ci
ON di.dcf_inst_cd_new = ci.dcf_dsf_inst_cd ON dim.dcf_inst_cd_new = ci.dcf_dsf_inst_cd
WHERE WHERE
ci.delete_flg = '0' ci.delete_flg = '0'
AND STR_TO_DATE(di.tekiyo_month, '%Y%m') <= (SELECT STR_TO_DATE(syor_date, '%Y%m%d') FROM hdke_tbl) AND src05.to_date_yyyymm01(dim.tekiyo_month) <= src05.get_syor_date()
AND di.muko_flg = '0' AND dim.muko_flg = '0'
AND di.enabled_flg = 'Y'; AND dim.enabled_flg = 'Y';
COMMIT;
END END

38
rds_mysql/stored_procedure/v_inst_merge_t_create.sql
View File

@ -3,7 +3,6 @@ CREATE PROCEDURE src05.v_inst_merge_t_create()
SQL SECURITY INVOKER SQL SECURITY INVOKER
BEGIN BEGIN
-- 例外処理 -- 例外処理
-- エラーが発生した場合に一時テーブルの削除を実施
DECLARE EXIT HANDLER FOR SQLEXCEPTION DECLARE EXIT HANDLER FOR SQLEXCEPTION
BEGIN BEGIN
GET DIAGNOSTICS CONDITION 1 GET DIAGNOSTICS CONDITION 1
@ -14,7 +13,6 @@ BEGIN
END; END;
SET @error_state = NULL, @error_msg = NULL; SET @error_state = NULL, @error_msg = NULL;
START TRANSACTION;
TRUNCATE TABLE internal05.v_inst_merge_t; TRUNCATE TABLE internal05.v_inst_merge_t;
@ -28,15 +26,15 @@ BEGIN
prft_cd prft_cd
) )
SELECT SELECT
vv.v_inst_cd, vhmv.v_inst_cd,
vv.v_inst_cd_merg, vhmv.v_inst_cd_merg,
fv.fcl_name, fmv.fcl_name,
fv.fcl_kn_name, fmv.fcl_kn_name,
fv.fmt_addr, fmv.fmt_addr,
fv.prft_cd fmv.prft_cd
FROM FROM
src05.vop_hco_merge_v vv, src05.vop_hco_merge_v vhmv,
src05.fcl_mst_v fv src05.fcl_mst_v fmv
INNER JOIN ( INNER JOIN (
SELECT SELECT
v_inst_cd, v_inst_cd,
@ -45,21 +43,15 @@ BEGIN
src05.fcl_mst_v src05.fcl_mst_v
GROUP BY GROUP BY
v_inst_cd v_inst_cd
) fmv1 ) max_sno_fmv
ON fv.v_inst_cd = fmv1.v_inst_cd ON fmv.v_inst_cd = max_sno_fmv.v_inst_cd
AND fv.sub_num = fmv1.sno AND fmv.sub_num = max_sno_fmv.sno
WHERE WHERE
vv.v_inst_cd_merg = fv.v_inst_cd vhmv.v_inst_cd_merg = fmv.v_inst_cd
AND STR_TO_DATE(vv.apply_dt, '%Y-%m-%d') <= ( AND STR_TO_DATE(vhmv.apply_dt, '%Y-%m-%d') <= src05.get_syor_date()
SELECT
STR_TO_DATE(syor_date, '%Y%m%d')
FROM
src05.hdke_tbl
)
AND ((fcl_type IN ('A1','A0')) OR fcl_type BETWEEN '20' AND '29') AND ((fcl_type IN ('A1','A0')) OR fcl_type BETWEEN '20' AND '29')
AND fv.rec_sts_kbn != '9' AND fmv.rec_sts_kbn != '9'
ORDER BY ORDER BY
STR_TO_DATE(vv.apply_dt, '%Y-%m-%d') ASC; STR_TO_DATE(vhmv.apply_dt, '%Y-%m-%d') ASC;
COMMIT;
END END