036 cache, capacity

crm2cloud.cfm

@@ -8,7 +8,7 @@
 <m:prepare_ls entity="crm2cloud" settingsKey="crm2cloud" accessObject="" pageInfoOut="pageInfo" trackOut="tr"/>
 
 <!--- *** нуждается в оптимизации, чтобы фильтр по контрагенту ускорял селект --->
-<cfquery name="qRead">
+<cfquery name="qRead" cachedWithin=#createTimeSpan(0, 0, 25, 0)#>
 WITH 
 status(status, status_id, probability_pc) as (VALUES
 	('Закрыта неуспешно',7,0),('Закрыта успешно',6,100),('Договор подписан',5,100),('Договор на подписании',15,90),('Договор на согласовании',12,70),
@@ -81,7 +81,7 @@ z.id_klienta as WZ, z.__name as client, z.__id as company_uid, round(sum(c.cnt*o
 FROM stair o
 JOIN elma.companies z on (o._companies=z.__id)
 LEFT OUTER JOIN component c on (c.__id = ANY (o.params))
-WHERE c.code LIKE 'iaas.ngc.%.ram-_' AND c.cnt <> 0 AND o.cnt <> 0
+WHERE c.code SIMILAR TO 'iaas.(ngc|dcp).%.ram-_' AND c.cnt <> 0 AND o.cnt <> 0
 GROUP BY z.id_klienta, z.__id, z.__name
 ),
 sold_cpu as (SELECT
@@ -91,7 +91,7 @@ z.id_klienta as WZ, z.__name as client, z.__id as company_uid, round(sum(c.cnt*o
 FROM stair o
 JOIN elma.companies z on (o._companies=z.__id)
 LEFT OUTER JOIN component c on (c.__id = ANY (o.params))
-WHERE c.code LIKE 'iaas.ngc.%.vcpu%-_' AND c.cnt <> 0 AND o.cnt <> 0
+WHERE c.code SIMILAR TO 'iaas.(ngc|dcp).%.vcpu%-_' AND c.cnt <> 0 AND o.cnt <> 0
 GROUP BY z.id_klienta, z.__id, z.__name
 ),
 sold_disk as (SELECT
@@ -101,7 +101,7 @@ z.id_klienta as WZ, z.__name as client, z.__id as company_uid, round(sum(c.cnt*o
 FROM stair o
 JOIN elma.companies z on (o._companies=z.__id)
 LEFT OUTER JOIN component c on (c.__id = ANY (o.params))
-WHERE c.code SIMILAR TO 'iaas.ngc.%.(ssd|fstssd|sata)-_' AND c.cnt <> 0 AND o.cnt <> 0
+WHERE c.code SIMILAR TO 'iaas.(ngc|dcp).%.(ssd|fstssd|sata)-_' AND c.cnt <> 0 AND o.cnt <> 0
 GROUP BY z.id_klienta, z.__id, z.__name
 ),
 deal_stat as (