From 558cfdea02974c6fb6ea47631c9dd91fc1722169 Mon Sep 17 00:00:00 2001 From: Johannes Hoermann <j.hoermann@adito.de> Date: Fri, 29 Mar 2019 09:48:29 +0100 Subject: [PATCH] fix offer index sql --- .../indexsearchgroups/offer/query.js | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/aliasDefinition/Data_alias/indexsearchgroups/offer/query.js b/aliasDefinition/Data_alias/indexsearchgroups/offer/query.js index 1ad88702c6..1244f85e0f 100644 --- a/aliasDefinition/Data_alias/indexsearchgroups/offer/query.js +++ b/aliasDefinition/Data_alias/indexsearchgroups/offer/query.js @@ -1,26 +1,26 @@ -import("system.result"); -import("system.vars"); -import("system.calendars"); -import("system.db"); -import("Keyword_lib"); -import("Sql_lib"); -import("KeywordRegistry_basic"); - -var sqlQuery, sqlHelper, queryCondition, affectedIds; -queryCondition = ""; -if (vars.exists("$local.idvalue")) { - affectedIds = vars.get("$local.idvalue"); - queryCondition = "where OFFERID in ('" + affectedIds.map(function (v){return db.quote(v);}).join("', '") + "')"; - //TODO: refactor this for incremental indexer (injections?) -} -sqlHelper = new SqlMaskingUtils(); -sqlQuery = "select OFFERID, " - + sqlHelper.concat(["OFFERCODE", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.offerStatus(), "OFFER.STATUS")], " | ") - + " as TITLECOLUMN, " - + sqlHelper.concat(["ORGANISATION.NAME", "'| Kd-Nr.: '", "CUSTOMERCODE"]) - + " as DESCCOLUMN, OFFERCODE, ORGANISATION.NAME, CUSTOMERCODE " - + " from OFFER " - + " join CONTACT on OFFER.CONTACT_ID = CONTACTID " - + " join ORGANISATION on ORGANISATIONID = CONTACT.ORGANISATION_ID " - + queryCondition + " order by OFFERCODE "; +import("system.result"); +import("system.vars"); +import("system.calendars"); +import("system.db"); +import("Keyword_lib"); +import("Sql_lib"); +import("KeywordRegistry_basic"); + +var sqlQuery, sqlHelper, queryCondition, affectedIds; +queryCondition = ""; +if (vars.exists("$local.idvalue")) { + affectedIds = vars.get("$local.idvalue"); + queryCondition = "where OFFERID in ('" + affectedIds.map(function (v){return db.quote(v);}).join("', '") + "')"; + //TODO: refactor this for incremental indexer (injections?) +} +sqlHelper = new SqlMaskingUtils(); +sqlQuery = "select OFFERID, " + + sqlHelper.concat(["cast(OFFERCODE as CHAR(10)) ", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.offerStatus(), "OFFER.STATUS")], " | ") + + " as TITLECOLUMN, " + + sqlHelper.concat(["ORGANISATION.NAME", "'| Kd-Nr.: '", "CUSTOMERCODE"]) + + " as DESCCOLUMN, OFFERCODE, ORGANISATION.NAME, CUSTOMERCODE " + + " from OFFER " + + " join CONTACT on OFFER.CONTACT_ID = CONTACTID " + + " join ORGANISATION on ORGANISATIONID = CONTACT.ORGANISATION_ID " + + queryCondition + " order by OFFERCODE "; result.string(sqlQuery); \ No newline at end of file -- GitLab