admin/Customer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARAI#59522 -- Berekening compliance aangepast

Browse Source 
svn path=/Customer/trunk/; revision=47303
This commit is contained in:
Robin Stoker
2020-07-02 14:33:38 +00:00
parent 216ce385f7
commit 1e47bbeaa8
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
ARAI/arai.sql
View File

@@ -12993,8 +12993,7 @@ CREATE OR REPLACE VIEW arai_v_rap_compliance_data
beheerder
)
AS
SELECT DISTINCT
i.ins_deel_key,
SELECT i.ins_deel_key,
dl.ins_deelsrtcontrole_key,
disc.ins_discipline_omschrijving,
ic.ins_discipline_omschrijving,
@@ -13071,6 +13070,7 @@ AS
WHERE dl.ins_deel_key = i.ins_deel_key
AND dl.ins_srtcontrole_key = s.ins_srtcontrole_key
AND i.ins_srtdeel_key = srt.ins_srtdeel_key
AND i.ins_srtdeel_key = s.ins_srtinstallatie_key
AND i.ins_discipline_key = ic.ins_discipline_key
AND dl.ins_deelsrtcontrole_status = st.ins_controlestatus_key
AND s.ctr_discipline_key = disc.ins_discipline_key
@@ -13082,7 +13082,7 @@ AS
AND dl.ins_deelsrtcontrole_plandatum > SYSDATE - 365
AND dl.ins_deelsrtcontrole_status IN (0, 2) -- gepland, in behandeling
UNION ALL
SELECT DISTINCT
SELECT
i.ins_deel_key,
dl.ins_deelsrtcontrole_key,
disc.ins_discipline_omschrijving,
@@ -13135,6 +13135,7 @@ AS
WHERE dl.ins_deel_key = i.ins_deel_key
AND dl.ins_srtcontrole_key = s.ins_srtcontrole_key
AND i.ins_srtdeel_key = srt.ins_srtdeel_key
AND i.ins_srtdeel_key = s.ins_srtinstallatie_key
AND i.ins_discipline_key = ic.ins_discipline_key
AND dl.ins_deelsrtcontrole_status = st.ins_controlestatus_key
AND s.ctr_discipline_key = disc.ins_discipline_key
@@ -13145,9 +13146,9 @@ AS
AND av.alg_gebouw_key = ag.alg_gebouw_key
AND dl.ins_deelsrtcontrole_status IN (5, 6)
UNION ALL
SELECT DISTINCT
SELECT
i.ins_deel_key,
dl.ins_deelsrtcontrole_key,
NULL,
disc.ins_discipline_omschrijving,
ic.ins_discipline_omschrijving,
srt.ins_srtdeel_omschrijving,
@@ -13216,7 +13217,7 @@ AS
FROM prs_v_perslid_fullnames f
WHERE f.prs_perslid_key = i.prs_perslid_key_beh)
beheerder
FROM ins_deelsrtcontrole dl,
FROM
ins_deel i,
ins_srtcontrole s,
ins_srtdeel srt,
@@ -13225,9 +13226,8 @@ AS
alg_gebouw ag,
alg_ruimte ar,
alg_verdieping av
WHERE dl.ins_deel_key = i.ins_deel_key
AND dl.ins_srtcontrole_key = s.ins_srtcontrole_key
AND i.ins_srtdeel_key = srt.ins_srtdeel_key
WHERE i.ins_srtdeel_key = srt.ins_srtdeel_key
AND i.ins_srtdeel_key = s.ins_srtinstallatie_key
AND i.ins_discipline_key = ic.ins_discipline_key
AND s.ctr_discipline_key = disc.ins_discipline_key
AND disc.ins_discipline_key IN (1941, 2021)
@@ -13235,8 +13235,7 @@ AS
AND i.ins_alg_ruimte_type = 'R'
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 dl.ins_deelsrtcontrole_plandatum IS NULL;
AND i.ins_deel_verwijder IS NULL;
CREATE OR REPLACE VIEW arai_v_graph_com_totaal
(
@@ -13701,17 +13700,24 @@ CREATE OR REPLACE VIEW arai_v_rap_safesight_afm
AS
SELECT m.mld_melding_key,
s.mld_statuses_omschrijving,
t.fac_tracking_datum,
MAX (t.fac_tracking_datum),
m.mld_melding_opmerking
FROM mld_melding m,
mld_statuses s,
fac_tracking t,
prs_perslid p
WHERE t.fac_srtnotificatie_key = 29 -- Afgemeld
WHERE t.fac_srtnotificatie_key IN (33, 28, 40, 29, 34) -- Nieuw, Geaccepteerd, In behandeling, Afgemeld, Afgewezen
AND t.fac_tracking_refkey = m.mld_melding_key
AND m.mld_melding_status = s.mld_statuses_key
AND m.prs_perslid_key = p.prs_perslid_key
AND p.prs_perslid_oslogin = '_SAPI';
AND p.prs_perslid_oslogin = '_SAPI'
GROUP BY (m.mld_melding_key, s.mld_statuses_omschrijving, m.mld_melding_opmerking);
CREATE OR REPLACE VIEW arai_v_rap_safesightmails (person_id, person_email)
AS
SELECT prs_perslid_key, prs_perslid_email
FROM prs_perslid
WHERE prs_perslid_verwijder IS NULL AND prs_perslid_email IS NOT NULL;
CREATE OR REPLACE VIEW arai_v_rap_kpi_csu
(