feat: レビュー指摘対応

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

View File

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

View File

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