FCLT#87560 Dubbele vermeldingen in fiatteringsoverzicht door MLDUPD tracking
svn path=/Website/trunk/; revision=71004
This commit is contained in:
@@ -1366,8 +1366,8 @@ function getSqlInstemMld(fiatstatus, prsKeys, params)
|
||||
+ " , mld_melding_datum sortdate"
|
||||
+ " , " + lcl.xsql("di.ins_discipline_omschrijving", "di.ins_discipline_key") + " categorie"
|
||||
+ (fiatstatus == "open"
|
||||
? " , pf2.prs_perslid_naam_full"
|
||||
: " , ''") + " fiatteur"
|
||||
? " , pf2.prs_perslid_naam_full"
|
||||
: " , ''") + " fiatteur"
|
||||
+ " , NULL bes_bestelling_parentkey"
|
||||
+ " , sd.ins_srtdiscipline_prefix prefix"
|
||||
+ " , NULL uitvoerende"
|
||||
@@ -1385,8 +1385,8 @@ function getSqlInstemMld(fiatstatus, prsKeys, params)
|
||||
+ " , alg_locatie l"
|
||||
+ (fiatstatus == "open"
|
||||
? " , prs_v_perslid_fullnames_all pf2"
|
||||
: " , fac_tracking ft"
|
||||
+ " , fac_srtnotificatie fno")
|
||||
: ""
|
||||
)
|
||||
+ " WHERE m.prs_perslid_key_voor = pf.prs_perslid_key"
|
||||
+ " AND m.mld_alg_onroerendgoed_keys = v.alg_onroerendgoed_keys(+)"
|
||||
+ " AND m.mld_alg_locatie_key = l.alg_locatie_key(+)"
|
||||
@@ -1395,22 +1395,28 @@ function getSqlInstemMld(fiatstatus, prsKeys, params)
|
||||
+ " AND sm.mld_ins_discipline_key = di.ins_discipline_key"
|
||||
+ (fiatstatus == "open"
|
||||
? " AND mld_melding_status = 2"
|
||||
+ " AND mld_melding_conceptstatus > 0"
|
||||
+ " AND pf2.prs_perslid_key = mld.getinstemmer(m.mld_melding_key)"
|
||||
+ " AND pf2.prs_perslid_key IN (" + prsKeys + ")" // Alleen mijn instemmingen
|
||||
: " AND ft.fac_tracking_refkey = m.mld_melding_key"
|
||||
+ " AND ft.fac_srtnotificatie_key = fno.fac_srtnotificatie_key"
|
||||
+ " AND ft.prs_perslid_key IN (" + prsKeys + ")"
|
||||
+ (fiatstatus == "close"
|
||||
? " AND fno.fac_srtnotificatie_code IN ('MLDUPD')"
|
||||
+ " AND ft.fac_tracking_datum <= (SELECT MIN(ft2.fac_tracking_datum)"
|
||||
+ " FROM fac_tracking ft2"
|
||||
+ " , fac_srtnotificatie fno2"
|
||||
+ " WHERE ft2.fac_tracking_refkey = m.mld_melding_key"
|
||||
+ " AND ft2.fac_srtnotificatie_key = fno2.fac_srtnotificatie_key"
|
||||
+ " AND fno2.fac_srtnotificatie_code IN ('MLDNEW'))"
|
||||
: " AND fno.fac_srtnotificatie_code IN ('MLDREJ')"));
|
||||
|
||||
+ " AND mld_melding_conceptstatus > 0"
|
||||
+ " AND pf2.prs_perslid_key = mld.getinstemmer(m.mld_melding_key)"
|
||||
+ " AND pf2.prs_perslid_key IN (" + prsKeys + ")" // Alleen mijn instemmingen
|
||||
: " AND EXISTS (SELECT ft.fac_tracking_key"
|
||||
+ " FROM fac_tracking ft"
|
||||
+ " , fac_srtnotificatie fno"
|
||||
+ " WHERE ft.fac_srtnotificatie_key = fno.fac_srtnotificatie_key"
|
||||
+ " AND ft.fac_tracking_refkey = m.mld_melding_key"
|
||||
+ " AND ft.prs_perslid_key IN (" + prsKeys + ")"
|
||||
+ (fiatstatus == "close"
|
||||
? " AND fno.fac_srtnotificatie_code IN ('MLDUPD')"
|
||||
+ " AND ft.fac_tracking_datum <= (SELECT MIN(ft2.fac_tracking_datum)"
|
||||
+ " FROM fac_tracking ft2"
|
||||
+ " , fac_srtnotificatie fno2"
|
||||
+ " WHERE ft2.fac_srtnotificatie_key = fno2.fac_srtnotificatie_key"
|
||||
+ " AND ft2.fac_tracking_refkey = m.mld_melding_key"
|
||||
+ " AND fno2.fac_srtnotificatie_code IN ('MLDNEW')"
|
||||
+ " )"
|
||||
: " AND fno.fac_srtnotificatie_code IN ('MLDREJ')"
|
||||
)
|
||||
+ " )"
|
||||
);
|
||||
return sql;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user