diff --git a/MDUX/mdux.sql b/MDUX/mdux.sql index dd9a74dcf..2e8326a43 100644 --- a/MDUX/mdux.sql +++ b/MDUX/mdux.sql @@ -3950,34 +3950,49 @@ AS d.ins_deel_key, d.ins_deel_omschrijving, COALESCE ( - TRUNC (dsc.ins_deelsrtcontrole_plandatum), - TRUNC(COALESCE ( - (SELECT MAX (dsc.ins_deelsrtcontrole_plandatum) - FROM ins_deelsrtcontrole dsc - WHERE dsc.ins_deel_key = d.ins_deel_key - AND sc.ins_srtcontrole_key = - dsc.ins_srtcontrole_key - AND dsc.ins_deelsrtcontrole_status IN (5, 6)), - TRUNC(fac.nextcyclusdatedeel ( - d.ins_deel_key, - sc.ins_srtcontrole_key, - 1))))) AS cpland, + TRUNC (dsc.ins_deelsrtcontrole_plandatum), + TRUNC(COALESCE ( + (SELECT MAX (dsc.ins_deelsrtcontrole_plandatum) + FROM ins_deelsrtcontrole dsc + WHERE dsc.ins_deel_key = d.ins_deel_key + AND sc.ins_srtcontrole_key = + dsc.ins_srtcontrole_key + AND dsc.ins_deelsrtcontrole_status IN (5, 6)), + TRUNC(fac.nextcyclusdatedeel (d.ins_deel_key, + sc.ins_srtcontrole_key, + 1))))) + AS cpland, (CASE WHEN d.ins_alg_ruimte_type = 'R' THEN l.alg_locatie_key WHEN d.ins_alg_ruimte_type = 'A' THEN a.prs_afdeling_key ELSE NULL END) AS extra_key, - (SELECT prs_bedrijf_email - FROM prs_bedrijf lev - WHERE lev.prs_bedrijf_key = - (SELECT MAX(fac.safe_to_number ( - levk.ins_kenmerk_default)) - FROM ins_kenmerk levk - WHERE levk.ins_kenmerk_verwijder IS NULL - AND levk.ins_srtkenmerk_key = 202 -- Kenmerksoort "Leverancier object" - AND levk.ins_srtinstallatie_key = - sc.ins_srtcontrole_key)) + (SELECT prs_bedrijf_email + || ';' + || (SELECT prs_perslid_email + FROM prs_perslid + WHERE prs_perslid_key = 114914) -- Persoon '_Controle notificaties taken', hier gaan de notificatie emails (extern) dan ook naar toe. + FROM (SELECT prs_bedrijf_email + FROM prs_bedrijf lev + WHERE lev.prs_bedrijf_key = + (SELECT MAX(fac.safe_to_number ( + levk.ins_kenmerk_default)) + FROM ins_kenmerk levk + WHERE levk.ins_kenmerk_verwijder IS NULL + AND levk.ins_srtkenmerk_key = 202 -- Kenmerksoort "Leverancier object" + AND levk.ins_srtinstallatie_key = + sc.ins_srtcontrole_key)) + WHERE (SELECT prs_bedrijf_email + FROM prs_bedrijf lev + WHERE lev.prs_bedrijf_key = + (SELECT MAX(fac.safe_to_number ( + levk.ins_kenmerk_default)) + FROM ins_kenmerk levk + WHERE levk.ins_kenmerk_verwijder IS NULL + AND levk.ins_srtkenmerk_key = 202 -- Kenmerksoort "Leverancier object" + AND levk.ins_srtinstallatie_key = + sc.ins_srtcontrole_key)) IS NOT NULL) AS xemail FROM ins_deel d, ins_srtdeel sd, @@ -4034,6 +4049,33 @@ AS TRUNC (fac.nextcyclusdatedeel (rap.dkey, rap.sckey, 1))))) = TRUNC (SYSDATE + 28) AND rap.objbehkey IS NOT NULL + GROUP BY ('Geplande taak - ' || rap.sdoms || ' - ' || rap.locoms), + rap.objbehkey, + rap.extra_key + UNION ALL -- Om ook de persoon '_Controle notificaties taken' een notificatie email te sturen + SELECT 'CUST04', + NULL, + (SELECT prs_perslid_email + FROM prs_perslid + WHERE prs_perslid_key = 114914), -- Persoon '_Controle notificaties taken', hier gaan de notificatie emails (intern) dan ook naar toe. + ('Geplande taak - ' || rap.sdoms || ' - ' || rap.locoms), + (SELECT MAX (fac_usrrap_key) + FROM fac_usrrap + WHERE fac_usrrap_view_name = 'MDUX_V_RAP_TAKEN') + rapportnr, + rap.extra_key + FROM mdux_v_rap_taken rap + WHERE COALESCE ( + TRUNC (rap.cpland), + TRUNC(COALESCE ( + (SELECT MAX (dsc.ins_deelsrtcontrole_plandatum) + FROM ins_deelsrtcontrole dsc + WHERE dsc.ins_deel_key = rap.dkey + AND rap.sckey = dsc.ins_srtcontrole_key + AND dsc.ins_deelsrtcontrole_status IN (5, 6)), + TRUNC (fac.nextcyclusdatedeel (rap.dkey, rap.sckey, 1))))) = + TRUNC (SYSDATE + 28) + AND rap.objbehkey IS NOT NULL GROUP BY ('Geplande taak - ' || rap.sdoms || ' - ' || rap.locoms), rap.objbehkey, rap.extra_key;