svn path=/Website/branches/v2017.3/; revision=38338
This commit is contained in:
Jos Groot Lipman
2018-06-27 06:57:06 +00:00
parent e5fcfa83c3
commit c5a2d1c4eb
4 changed files with 19 additions and 14 deletions

View File

@@ -214,7 +214,8 @@ function bez_list(pautfunction, params)
if (!groupbez) // elke individuele bezoeker
{ // geen management info => fe, fo en bo
sql = "SELECT a.bez_afspraak_key afspr_key"
sql = "SELECT /*+ CURSOR_SHARING_EXACT */ " // cursor sharing uit zodat index op bez_afspraak_datum beter gebruikt wordt
+ " a.bez_afspraak_key afspr_key"
+ ", rrr.res_rsv_ruimte_key"
+ ", a.bez_afspraak_datum"
+ ", b.bez_afspraak_naam"

View File

@@ -1280,9 +1280,6 @@ mld = {setmeldingstatus:
+ ", alg_v_allonrgoed_gegevens v"
+ ", alg_locatie l"
+ ", alg_district di"
+ ", (SELECT m1.mld_melding_key"
+ " , mld.getactualuitvoer (m1.mld_melding_key) actualuitvoertijd"
+ " FROM mld_melding m1) gau"
+ (verantw_key
? ", alg_gebouw g"
: "")
@@ -1355,7 +1352,6 @@ mld = {setmeldingstatus:
? " AND p.prs_afdeling_key = b.prs_afdeling_key"
: "")
+ " AND std.mld_stdmelding_key = m.mld_stdmelding_key"
+ " AND m.mld_melding_key = gau.mld_melding_key"
+ (perform && srtdisc_key
? " AND sd.ins_srtdiscipline_key = md.ins_srtdiscipline_key"
: "")

View File

@@ -355,6 +355,7 @@ function mld_list (pautfunction, params)
} // minfo only
// Voeg laatste tracking datum toe
if (0) // te duur
sqln += (minfo
? ", TO_DATE('01-01-1970', 'DD-MM-YYYY')"
: ", (SELECT MAX(t.fac_tracking_datum)"
@@ -492,7 +493,18 @@ function mld_list (pautfunction, params)
class1 += " orderready";
}
var mld_recent = new Date(oRs("recentdatum").Value);
// Ik zou dit liever in de hoofdquery meenemen maar Oracle12 komt daar slecht uit
// Hier per regel ophalen is netto veel sneller
var sql = "SELECT MAX(t.fac_tracking_datum) recentdatum"
+ " FROM fac_tracking t"
+ " , fac_srtnotificatie sn"
+ " WHERE t.fac_srtnotificatie_key = sn.fac_srtnotificatie_key"
+ " AND t.fac_tracking_refkey = " + oRs("mld_melding_key").Value
+ " AND sn.fac_srtnotificatie_xmlnode = 'melding'";
var roRs = Oracle.Execute(sql);
var mld_recent = new Date(roRs("recentdatum").Value);
roRs.Close();
if (mld_recent > recent)
{
class1 += " updated";

View File

@@ -703,10 +703,9 @@ function res_list (pautfunction, params)
+ ", rec2.res_rsv_ruimte_volgnr"
+ ", rec2.res_rsv_ruimte_key rsv_ruimte_key"
+ ", (SELECT COUNT('1')"
+ " FROM res_rsv_deel rrd, res_deel resd"
+ " FROM res_rsv_deel rrd"
+ " WHERE rrd.res_rsv_ruimte_key = rec2.res_rsv_ruimte_key"
+ " AND rrd.res_deel_key = resd.res_deel_key"
+ (S("vis_parking_key") != -1 ? " AND resd.res_discipline_key != " + S("vis_parking_key") : "")
+ " AND bez_bezoekers_key IS NULL"
+ ") + "
+ " (SELECT COUNT('2')"
+ " FROM res_rsv_artikel"
@@ -1299,12 +1298,9 @@ function res_list (pautfunction, params)
+ " , res_geg.res_type res_type"
+ " , res_geg.keycolumn keycolumn"
+ " , (SELECT COUNT('1')"
+ " FROM res_rsv_deel rrd, res_deel resd"
+ " FROM res_rsv_deel rrd"
+ " WHERE rrd.res_rsv_ruimte_key = res_geg.res_rsv_ruimte_key"
+ " AND rrd.res_deel_key = resd.res_deel_key"
+ (S("vis_parking_key") != -1
? " AND resd.res_discipline_key != " + S("vis_parking_key")
: "")
+ " AND bez_bezoekers_key IS NULL"
+ " ) + "
+ " (SELECT COUNT('2')"
+ " FROM res_rsv_artikel"