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

NMMS#32004 -- Aanpassingen tbv rapportage en freeze

Browse Source 
svn path=/Customer/trunk/; revision=25182
This commit is contained in:
Arthur Egberink
2015-05-13 08:26:35 +00:00
parent eb3adef9d2
commit 50192e92c1
1 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
NMMS/nmms.sql
View File

@@ -806,8 +806,7 @@ AS
--
-- view van nog te exporteren meldingen die afwijken of tot een korting leiden.
--
/* Formatted on 21-11-2014 9:06:14 (QP5 v5.136.908.31019) */
CREATE OR REPLACE FORCE VIEW nmms_v_monitoring_tot
CREATE OR REPLACE VIEW nmms_v_monitoring_tot
(
melding_key,
afw,
@@ -843,7 +842,9 @@ CREATE OR REPLACE FORCE VIEW nmms_v_monitoring_tot
stdmelding_key,
totaal,
overlappend,
kinderen
kinderen,
bedrijf_naam,
nmm_melding
)
AS
SELECT melding_key,
@@ -880,7 +881,9 @@ AS
stdmelding_key,
(COALESCE(kb,0) * COALESCE(wegingsfactor,1)) + COALESCE(kp,0),
SUBSTR(overlappend,1,100),
NULL
NULL,
bedrijf_naam,
nmm_melding
FROM nmms_v_monitoring
WHERE (kb IS NOT NULL OR kp IS NOT NULL)
AND ( (status = 'Afgemeld' AND afw IS NULL) OR (status = 'Historie'))
@@ -925,7 +928,9 @@ AS
(COUNT ( * ) - 4) * 250,
NULL,
listagg (melding_key, ',') WITHIN GROUP (ORDER BY melding_key)
AS kinderen
AS kinderen,
NULL,
NULL
FROM nmms_v_monitoring
WHERE typekorting = 'Kb'
AND thema IS NOT NULL
@@ -974,7 +979,9 @@ AS
(COUNT ( * ) - 4) * 250,
NULL,
listagg (melding_key, ',') WITHIN GROUP (ORDER BY melding_key)
AS kinderen
AS kinderen,
NULL,
NULL
FROM nmms_v_monitoring
WHERE typekorting = 'Kb'
AND thema IS NULL
@@ -1025,7 +1032,9 @@ AS
(COUNT ( * ) - 4) * 250,
NULL,
listagg (melding_key, ',') WITHIN GROUP (ORDER BY melding_key)
AS kinderen
AS kinderen,
NULL,
NULL
FROM nmms_v_monitoring r
WHERE typekorting = 'Kp'
AND indult = 'Nee'
@@ -1074,7 +1083,9 @@ AS
(COUNT ( * ) - 4) * 250,
NULL,
listagg (melding_key, ',') WITHIN GROUP (ORDER BY melding_key)
AS kinderen
AS kinderen,
NULL,
NULL
FROM nmms_v_monitoring r
WHERE typekorting = 'Kp'
AND indult = 'Nee'
@@ -1197,7 +1208,11 @@ CREATE OR REPLACE VIEW nmms_v_monitoring_history
fclt_f_dienst,
hide_f_stdmelding_key,
wegingsfactor,
totaal,
overlappend,
te_laat,
nmm,
bedrijf,
hide_f_melding_omschrijving,
hide_f_melding_opmerking
)
@@ -1238,7 +1253,11 @@ AS
dienst,
stdmelding_key,
wegingsfactor,
(COALESCE(kb,0) * COALESCE(wegingsfactor,1)) + COALESCE(kp,0) totaal,
overlappend,
DECODE(SIGN(thtijdstip - COALESCE(gereed,SYSDATE)), -1, 'x', '') te_laat,
DECODE(nmm_melding, 1, 'x', ''),
prs_bedrijf_naam,
mld_melding_omschrijving,
mld_melding_opmerking
FROM nmms_monitoring mo, mld_melding m
@@ -1282,6 +1301,11 @@ CREATE OR REPLACE VIEW nmms_v_dwh_monitoring
dienst,
stdmelding_key,
wegingsfactor,
totaal,
overlappend,
te_laat,
nmm,
bedrijf,
melding_omschrijving,
melding_opmerking,
kostensoort_oms,
@@ -1324,6 +1348,11 @@ AS
dienst,
stdmelding_key,
wegingsfactor,
(COALESCE(kb,0) * COALESCE(wegingsfactor,1)) + COALESCE(kp,0) totaal,
overlappend,
DECODE(SIGN(thtijdstip - COALESCE(gereed,SYSDATE)), -1, 'x', '') te_laat,
DECODE(nmm_melding, 1, 'x', ''),
prs_bedrijf_naam,
mld_melding_omschrijving,
mld_melding_opmerking,
(SELECT prs_kostensoort_oms
@@ -1446,6 +1475,8 @@ BEGIN
totaal,
overlappend,
kinderen,
prs_bedrijf_naam,
nmm_melding,
export_datum)
VALUES (rec.melding_key,
rec.afw,
@@ -1482,6 +1513,8 @@ BEGIN
DECODE (rec.indult, 'Ja', 0, rec.totaal),
rec.overlappend,
rec.kinderen,
rec.bedrijf_naam,
rec.nmm_melding,
SYSDATE);
END;
END;
@@ -1740,7 +1773,7 @@ GRANT SELECT ON nmms_v_dwh_opdr_materiaal TO aafm;
BEGIN adm.systrackscriptId('$Id$', 0); END;
/
BEGIN fac.registercustversion('NMMS', 6); END;
BEGIN fac.registercustversion('NMMS', 7); END;
/
COMMIT;
spool off