ARAI#73049 ARAI#72560 -- Foutmelding opgelost in diverse rapportages, wervergunning notificaties, event knelpunten in dagrap
svn path=/Customer/trunk/; revision=56282
This commit is contained in:
Robin Stoker
174
ARAI/arai.sql
174
ARAI/arai.sql
@@ -5105,7 +5105,7 @@ AS
|
||||
AND o.alg_locatie_key = i.ins_alg_locatie_key
|
||||
AND i.ins_alg_locatie_key = l.alg_locatie_key
|
||||
AND l.alg_district_key = di.alg_district_key
|
||||
AND sc.ctr_discipline_key = 2021 -- Inspecties
|
||||
AND sc.ctr_discipline_key IN (2021, 1941) -- Inspecties, Onderhoud
|
||||
AND sc.ins_srtcontrole_niveau = 'S'
|
||||
AND sc.ins_srtinstallatie_key = s.ins_srtdeel_key
|
||||
AND s.ins_srtdeel_key = i.ins_srtdeel_key
|
||||
@@ -5153,7 +5153,7 @@ AS
|
||||
AND o.alg_locatie_key = i.ins_alg_locatie_key
|
||||
AND i.ins_alg_locatie_key = l.alg_locatie_key
|
||||
AND l.alg_district_key = di.alg_district_key
|
||||
AND sc.ctr_discipline_key = 2021 -- Inspecties
|
||||
AND sc.ctr_discipline_key IN (2021, 1941) -- Inspecties, Onderhoud
|
||||
AND sc.ins_srtcontrole_niveau = 'G'
|
||||
AND sc.ins_srtinstallatie_key = sg.ins_srtgroep_key;
|
||||
|
||||
@@ -11223,7 +11223,8 @@ AS
|
||||
FROM mld_kenmerkmelding km, mld_kenmerk k
|
||||
WHERE km.mld_kenmerk_key = k.mld_kenmerk_key
|
||||
AND km.mld_melding_key = m.mld_melding_key
|
||||
AND k.mld_srtkenmerk_key = 1041)),
|
||||
AND k.mld_srtkenmerk_key = 1041
|
||||
AND k.mld_kenmerk_verwijder IS NULL)),
|
||||
(SELECT evenement
|
||||
FROM arai_v_events
|
||||
WHERE arai_events_key =
|
||||
@@ -11231,7 +11232,8 @@ AS
|
||||
FROM mld_kenmerkmelding km, mld_kenmerk k
|
||||
WHERE km.mld_kenmerk_key = k.mld_kenmerk_key
|
||||
AND km.mld_melding_key = m.mld_melding_key
|
||||
AND k.mld_srtkenmerk_key = 283)),
|
||||
AND k.mld_srtkenmerk_key = 283
|
||||
AND k.mld_kenmerk_verwijder IS NULL)),
|
||||
m.mld_melding_datum,
|
||||
mk.mld_kenmerk_volgnummer,
|
||||
msk.mld_srtkenmerk_omschrijving,
|
||||
@@ -11275,6 +11277,7 @@ AS
|
||||
1981,
|
||||
1982,
|
||||
1103,
|
||||
1661, -- evenement overschrijdend knelpunt
|
||||
1881) -- corona knelpunten
|
||||
AND km.mld_kenmerk_key = mk.mld_kenmerk_key
|
||||
AND km.mld_melding_key = m.mld_melding_key
|
||||
@@ -11303,7 +11306,8 @@ AS
|
||||
FROM mld_kenmerkmelding km, mld_kenmerk k
|
||||
WHERE km.mld_kenmerk_key = k.mld_kenmerk_key
|
||||
AND km.mld_melding_key = m.mld_melding_key
|
||||
AND k.mld_srtkenmerk_key = 283)),
|
||||
AND k.mld_srtkenmerk_key = 283
|
||||
AND k.mld_kenmerk_verwijder IS NULL)),
|
||||
m.mld_melding_datum,
|
||||
mk.mld_kenmerk_volgnummer,
|
||||
msk.mld_srtkenmerk_omschrijving,
|
||||
@@ -11351,6 +11355,7 @@ AS
|
||||
1981,
|
||||
1982,
|
||||
1103,
|
||||
1661, -- evenement overschrijdend knelpunt
|
||||
1881) -- corona knelpunten
|
||||
AND km.mld_kenmerk_key = mk.mld_kenmerk_key
|
||||
AND km.mld_melding_key = m.mld_melding_key
|
||||
@@ -11381,7 +11386,8 @@ SELECT DISTINCT
|
||||
FROM mld_kenmerkmelding km, mld_kenmerk k
|
||||
WHERE km.mld_kenmerk_key = k.mld_kenmerk_key
|
||||
AND km.mld_melding_key = m.mld_melding_key
|
||||
AND k.mld_srtkenmerk_key = 283)),
|
||||
AND k.mld_srtkenmerk_key = 283
|
||||
AND k.mld_kenmerk_verwijder IS NULL)),
|
||||
m.mld_melding_datum,
|
||||
mk.mld_kenmerk_volgnummer,
|
||||
msk.mld_srtkenmerk_omschrijving,
|
||||
@@ -11466,7 +11472,8 @@ AS
|
||||
FROM mld_kenmerkmelding km, mld_kenmerk k
|
||||
WHERE km.mld_kenmerk_key = k.mld_kenmerk_key
|
||||
AND km.mld_melding_key = m.mld_melding_key
|
||||
AND k.mld_srtkenmerk_key = 1681)),
|
||||
AND k.mld_srtkenmerk_key = 1681
|
||||
AND k.mld_kenmerk_verwijder IS NULL)),
|
||||
(SELECT fac_usrdata_code
|
||||
FROM fac_usrdata
|
||||
WHERE fac_usrdata_key =
|
||||
@@ -11474,7 +11481,8 @@ AS
|
||||
FROM mld_kenmerkmelding km, mld_kenmerk k
|
||||
WHERE km.mld_kenmerk_key = k.mld_kenmerk_key
|
||||
AND km.mld_melding_key = m.mld_melding_key
|
||||
AND k.mld_srtkenmerk_key = 1681)),
|
||||
AND k.mld_srtkenmerk_key = 1681
|
||||
AND k.mld_kenmerk_verwijder IS NULL)),
|
||||
(SELECT fac_usrdata_omschr
|
||||
FROM fac_usrdata
|
||||
WHERE fac_usrdata_key =
|
||||
@@ -11482,7 +11490,8 @@ AS
|
||||
FROM mld_kenmerkmelding km, mld_kenmerk k
|
||||
WHERE km.mld_kenmerk_key = k.mld_kenmerk_key
|
||||
AND km.mld_melding_key = m.mld_melding_key
|
||||
AND k.mld_srtkenmerk_key = 1682)),
|
||||
AND k.mld_srtkenmerk_key = 1682
|
||||
AND k.mld_kenmerk_verwijder IS NULL)),
|
||||
(SELECT TO_CHAR (fac_usrdata_prijs)
|
||||
FROM fac_usrdata
|
||||
WHERE fac_usrdata_key =
|
||||
@@ -11490,7 +11499,8 @@ AS
|
||||
FROM mld_kenmerkmelding km, mld_kenmerk k
|
||||
WHERE km.mld_kenmerk_key = k.mld_kenmerk_key
|
||||
AND km.mld_melding_key = m.mld_melding_key
|
||||
AND k.mld_srtkenmerk_key = 1682)),
|
||||
AND k.mld_srtkenmerk_key = 1682
|
||||
AND k.mld_kenmerk_verwijder IS NULL)),
|
||||
(SELECT evenement
|
||||
FROM arai_v_events
|
||||
WHERE arai_events_key =
|
||||
@@ -12002,7 +12012,8 @@ AS
|
||||
FROM mld_kenmerkmelding km, mld_kenmerk k
|
||||
WHERE km.mld_kenmerk_key = k.mld_kenmerk_key
|
||||
AND km.mld_melding_key = m.mld_melding_key
|
||||
AND k.mld_srtkenmerk_key IN (1103, 1104)))
|
||||
AND k.mld_srtkenmerk_key IN (1103, 1104)
|
||||
AND k.mld_kenmerk_verwijder IS NULL))
|
||||
sub,
|
||||
ms.mld_statuses_omschrijving,
|
||||
TRUNC (m.mld_melding_datum),
|
||||
@@ -13093,6 +13104,141 @@ SELECT
|
||||
WHERE UPPER(fac_notificatie_job_view) =
|
||||
'ARAI_V_NOTI_TMANAGER')) x
|
||||
WHERE x.receiver IS NOT NULL;
|
||||
|
||||
-- Notificaties t.b.v. aanvraag werkvergunningen
|
||||
CREATE OR REPLACE VIEW arai_v_noti_wv_goedgekeurd
|
||||
AS
|
||||
SELECT
|
||||
x.code,
|
||||
x.sender,
|
||||
x.receiver,
|
||||
x.text,
|
||||
x.key,
|
||||
x.xkey,
|
||||
x.xsender,
|
||||
x.xemail,
|
||||
x.xmobile,
|
||||
x.attachments
|
||||
FROM
|
||||
(SELECT 'CUST07' code,
|
||||
NULL sender,
|
||||
NULL receiver,
|
||||
'Uw aanvraag werktoestemming is goedgekeurd' text,
|
||||
m.mld_melding_key key,
|
||||
NULL xkey,
|
||||
NULL xsender,
|
||||
(SELECT mld_kenmerkmelding_waarde
|
||||
FROM mld_kenmerkmelding km
|
||||
WHERE km.mld_kenmerk_key = 5865
|
||||
AND km.mld_melding_key = m.mld_melding_key) || ';realestate@rai.nl' xemail, -- Email uitvoerder, en ook altijd naar realestate
|
||||
NULL xmobile,
|
||||
NULL attachments
|
||||
FROM mld_melding m, fac_tracking t
|
||||
WHERE m.mld_stdmelding_key = 5581 -- Aanvraag werktoestemming
|
||||
AND t.fac_tracking_refkey = m.mld_melding_key
|
||||
AND (UPPER (t.fac_tracking_oms) LIKE '%BEOORDELING OPDRACHTGEVER: (LEEG) --> GOEDGEKEURD%' OR UPPER (t.fac_tracking_oms) LIKE '%BEOORDELING OPDRACHTGEVER: AFGEKEURD --> GOEDGEKEURD%')
|
||||
AND t.fac_tracking_datum BETWEEN (SELECT fac_notificatie_job_nextrun
|
||||
- fac_notificatie_job_interval
|
||||
/ 24
|
||||
FROM fac_notificatie_job
|
||||
WHERE UPPER(fac_notificatie_job_view) =
|
||||
'ARAI_V_NOTI_WV_GOEDGEKEURD')
|
||||
AND (SELECT fac_notificatie_job_nextrun
|
||||
FROM fac_notificatie_job
|
||||
WHERE UPPER(fac_notificatie_job_view) =
|
||||
'ARAI_V_NOTI_WV_GOEDGEKEURD')) x
|
||||
WHERE x.xemail IS NOT NULL;
|
||||
|
||||
CREATE OR REPLACE VIEW arai_v_noti_wv_afgekeurd
|
||||
AS
|
||||
SELECT
|
||||
x.code,
|
||||
x.sender,
|
||||
x.receiver,
|
||||
x.text,
|
||||
x.key,
|
||||
x.xkey,
|
||||
x.xsender,
|
||||
x.xemail,
|
||||
x.xmobile,
|
||||
x.attachments
|
||||
FROM
|
||||
(SELECT 'CUST08' code,
|
||||
NULL sender,
|
||||
NULL receiver,
|
||||
'Uw aanvraag werktoestemming is afgekeurd' text,
|
||||
m.mld_melding_key key,
|
||||
NULL xkey,
|
||||
NULL xsender,
|
||||
(SELECT mld_kenmerkmelding_waarde
|
||||
FROM mld_kenmerkmelding km
|
||||
WHERE km.mld_kenmerk_key = 5865
|
||||
AND km.mld_melding_key = m.mld_melding_key) xemail, -- Email uitvoerder
|
||||
NULL xmobile,
|
||||
NULL attachments
|
||||
FROM mld_melding m, fac_tracking t
|
||||
WHERE m.mld_stdmelding_key = 5581 -- Aanvraag werktoestemming
|
||||
AND t.fac_tracking_refkey = m.mld_melding_key
|
||||
AND (UPPER (t.fac_tracking_oms) LIKE '%BEOORDELING OPDRACHTGEVER: (LEEG) --> AFGEKEURD%' OR UPPER (t.fac_tracking_oms) LIKE '%BEOORDELING OPDRACHTGEVER: GOEDGEKEURD --> AFGEKEURD%')
|
||||
AND t.fac_tracking_datum BETWEEN (SELECT fac_notificatie_job_nextrun
|
||||
- fac_notificatie_job_interval
|
||||
/ 24
|
||||
FROM fac_notificatie_job
|
||||
WHERE UPPER(fac_notificatie_job_view) =
|
||||
'ARAI_V_NOTI_WV_AFGEKEURD')
|
||||
AND (SELECT fac_notificatie_job_nextrun
|
||||
FROM fac_notificatie_job
|
||||
WHERE UPPER(fac_notificatie_job_view) =
|
||||
'ARAI_V_NOTI_WV_AFGEKEURD')) x
|
||||
WHERE x.xemail IS NOT NULL;
|
||||
|
||||
CREATE OR REPLACE VIEW arai_v_noti_wv_opdrachtgever
|
||||
AS
|
||||
SELECT
|
||||
x.code,
|
||||
x.sender,
|
||||
x.receiver,
|
||||
x.text,
|
||||
x.key,
|
||||
x.xkey,
|
||||
x.xsender,
|
||||
x.xemail,
|
||||
x.xmobile,
|
||||
x.attachments
|
||||
FROM
|
||||
(SELECT DISTINCT 'CUST09' code,
|
||||
NULL sender,
|
||||
(SELECT fac.safe_to_number (fac_usrdata_code)
|
||||
FROM fac_usrdata
|
||||
WHERE fac_usrdata_key =
|
||||
(SELECT MAX (mld_kenmerkmelding_waarde)
|
||||
FROM mld_kenmerkmelding km, mld_kenmerk k
|
||||
WHERE km.mld_kenmerk_key = k.mld_kenmerk_key
|
||||
AND km.mld_melding_key = m.mld_melding_key
|
||||
AND m.mld_melding_key = t.fac_tracking_refkey
|
||||
AND k.mld_srtkenmerk_key = 2301)) receiver, -- WV opdrachtgevers
|
||||
'Er staat een nieuwe aanvraag werktoestemming voor u klaar' text,
|
||||
m.mld_melding_key key,
|
||||
NULL xkey,
|
||||
NULL xsender,
|
||||
NULL xemail,
|
||||
NULL xmobile,
|
||||
NULL attachments
|
||||
FROM mld_melding m, fac_tracking t
|
||||
WHERE m.mld_stdmelding_key = 5581 -- Aanvraag werktoestemming
|
||||
AND t.fac_tracking_refkey = m.mld_melding_key
|
||||
AND t.fac_srtnotificatie_key = 33 -- MLDNEW
|
||||
AND t.fac_tracking_datum BETWEEN (SELECT fac_notificatie_job_nextrun
|
||||
- fac_notificatie_job_interval
|
||||
/ 24
|
||||
FROM fac_notificatie_job
|
||||
WHERE UPPER(fac_notificatie_job_view) =
|
||||
'ARAI_V_NOTI_WV_OPDRACHTGEVER')
|
||||
AND (SELECT fac_notificatie_job_nextrun
|
||||
FROM fac_notificatie_job
|
||||
WHERE UPPER(fac_notificatie_job_view) =
|
||||
'ARAI_V_NOTI_WV_OPDRACHTGEVER')) x
|
||||
WHERE x.receiver IS NOT NULL;
|
||||
|
||||
-- Zowel voltooide als lopende taken, t.b.v. compliance dashboards
|
||||
CREATE OR REPLACE VIEW arai_v_rap_compliance_data
|
||||
@@ -13208,6 +13354,8 @@ AS
|
||||
AND av.alg_gebouw_key = ag.alg_gebouw_key
|
||||
AND dl.ins_deelsrtcontrole_plandatum > SYSDATE - 365
|
||||
AND dl.ins_deelsrtcontrole_status IN (0, 2) -- gepland, in behandeling
|
||||
AND (s.ins_srtcontrole_eind > SYSDATE OR s.ins_srtcontrole_eind IS NULL)
|
||||
AND i.ins_deel_actief = 1
|
||||
UNION ALL
|
||||
SELECT
|
||||
i.ins_deel_key,
|
||||
@@ -13272,6 +13420,8 @@ AS
|
||||
AND ar.alg_verdieping_key = av.alg_verdieping_key
|
||||
AND av.alg_gebouw_key = ag.alg_gebouw_key
|
||||
AND dl.ins_deelsrtcontrole_status IN (5, 6)
|
||||
AND (s.ins_srtcontrole_eind > SYSDATE OR s.ins_srtcontrole_eind IS NULL)
|
||||
AND i.ins_deel_actief = 1
|
||||
UNION ALL
|
||||
SELECT
|
||||
i.ins_deel_key,
|
||||
@@ -13368,6 +13518,8 @@ AS
|
||||
AND ar.alg_verdieping_key = av.alg_verdieping_key
|
||||
AND av.alg_gebouw_key = ag.alg_gebouw_key
|
||||
AND i.ins_deel_verwijder IS NULL
|
||||
AND (s.ins_srtcontrole_eind > SYSDATE OR s.ins_srtcontrole_eind IS NULL)
|
||||
AND i.ins_deel_actief = 1
|
||||
AND NOT EXISTS (SELECT 'x' FROM ins_deelsrtcontrole
|
||||
WHERE i.ins_deel_key = ins_deel_key
|
||||
AND s.ins_srtcontrole_key = ins_srtcontrole_key
|
||||
|
||||
Reference in New Issue
Block a user