diff --git a/contragent.cfm b/contragent.cfm
index 7e26d98..1a9f63b 100644
--- a/contragent.cfm
+++ b/contragent.cfm
@@ -489,7 +489,7 @@
| #date_accept# |
#__index# |
#dateFormat(date_nop,'YYYY-MM-DD')# |
- #dateFormat(date_end,'YYYY-MM-DD')# |
+ #dateFormat(date_end,'YYYY-MM-DD')# |
#is_easy# |
diff --git a/crm2cloud.cfm b/crm2cloud.cfm
index d7b47de..e227348 100644
--- a/crm2cloud.cfm
+++ b/crm2cloud.cfm
@@ -59,6 +59,7 @@ stair as ( -- рабочая лесенка (инстансы строк, име
FROM line --WHERE probability_pc > 0
) t
WHERE t.dt_from = t.running_min_dt
+ AND t.dt_to > CURRENT_TIMESTAMP OR t.dt_to IS NULL
),
alloc as (select c."WZ" as wz
, round(sum(c."VM_RAM_Allocated")) as ram
@@ -92,7 +93,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-_'
+WHERE c.code LIKE 'iaas.ngc.%.vcpu%-_'
GROUP BY z.id_klienta, z.__id, z.__name
),
sold_disk as (SELECT
@@ -113,21 +114,24 @@ GROUP BY z.id_klienta
)
select
- r.wz as wz_sold,
- r.client as client_sold, r.company_uid,
- a.wz as wz_alloc,
- ds.status_ids,
- r.codes as ram_codes,
- r.quantity as ram_sold,
- a.ram as ram_alloc,
- a.ram_on as ram_alloc_on,
- c.codes as cpu_codes,
- c.quantity as cpu_sold,
- a.cpu as cpu_alloc,
- a.cpu_on as cpu_alloc_on,
- d.quantity as disk_sold,
- da.disk_alloc,
- d.codes as disk_codes
+
+ r.wz as wz_sold
+ r.client as client_sold
+ r.company_uid
+ a.wz as wz_alloc
+ ds.status_ids
+ r.codes as ram_codes
+ r.quantity as ram_sold
+ a.ram as ram_alloc
+ a.ram_on as ram_alloc_on
+ c.codes as cpu_codes
+ c.quantity as cpu_sold
+ a.cpu as cpu_alloc
+ a.cpu_on as cpu_alloc_on
+ d.quantity as disk_sold
+ da.disk_alloc
+ d.codes as disk_codes
+
from sold_ram r
join deal_stat ds on (r.wz=ds.wz)
join sold_cpu c on (r.wz=c.wz)
@@ -142,10 +146,10 @@ order by 1,3
-
+
-
+