diff --git a/Application.cfc b/Application.cfc index b826795..375f316 100644 --- a/Application.cfc +++ b/Application.cfc @@ -87,7 +87,7 @@ - + diff --git a/cloud_capacity.cfm b/cloud_capacity.cfm index 1663177..05b105c 100644 --- a/cloud_capacity.cfm +++ b/cloud_capacity.cfm @@ -223,6 +223,11 @@ where 1=1 order by + + + + + select sum(hosts_total) as hosts_total @@ -260,7 +265,10 @@ select from qRead - + + + + diff --git a/contragent.cfm b/contragent.cfm index 2c11812..e6a97eb 100644 --- a/contragent.cfm +++ b/contragent.cfm @@ -170,10 +170,14 @@ ,s.probability_pc ,d.__index ,d.__id as deal_uid + ,siv.end_customer as end_customer_uid + ,z.id_klienta as end_customer_wz + ,z.__name as end_customer_name from elma.deals_services siv join elma.deals d on d.__id=ANY(siv.deal) join status s on (d.__status_status=s.status_id) join elma.service_parametrs p ON (p.__id = ANY (siv.params) AND p."__deletedAt" IS NULL) + left outer join elma.companies z on (siv.end_customer=z.__id) left outer join elma.additional_agreements a on (a.__id=ANY(siv.additional_agreement)) where d._companies= AND siv.is_actual @@ -192,24 +196,25 @@ __index - user_description + user description Компоненты Кол-во Скидка% Сумма Код type - is_actual + is actual hash version - name_version - date_accept + name version + date accept __index - date_nop - date_end - is_easy - Вер.% - additional_agreement + date nop + date end + is easy + Вер.% + Дополнительное соглашение + Конечник @@ -259,6 +264,7 @@ #probability_pc# #additional_agreement# + #end_customer_wz# diff --git a/crm2cloud.cfm b/crm2cloud.cfm index ce66728..7aa45e3 100644 --- a/crm2cloud.cfm +++ b/crm2cloud.cfm @@ -52,10 +52,14 @@ WITH ,d.__status_status AS deal_status_id ,siv.user_description ,siv.params + ,siv.end_customer as end_customer_uid + ,z.id_klienta as end_customer_wz + ,z.__name as end_customer_name FROM elma.deals_services siv JOIN elma.deals d ON (d.__id = ANY (siv.deal)) JOIN STATUS s ON (d.__status_status = s.status_id) - LEFT JOIN elma.additional_agreements a ON (a.__id = ANY (siv.additional_agreement)) + LEFT OUTER JOIN elma.additional_agreements a ON (a.__id = ANY (siv.additional_agreement)) + LEFT OUTER JOIN elma.companies z on (siv.end_customer=z.__id) WHERE siv.is_actual AND siv."__deletedAt" IS NULL AND d."__deletedAt" IS NULL @@ -274,6 +278,7 @@ select r.wz as wz_sold r.client as client_sold + r.end_customer_wz r.company_uid a.wz as wz_alloc u.manager @@ -367,6 +372,7 @@ S3 операции и трафик: #dateFormat(qS3OpsTrfAge.dt_load,'YYYY-M + @@ -408,6 +414,7 @@ S3 операции и трафик: #dateFormat(qS3OpsTrfAge.dt_load,'YYYY-M #alloc_company# + #end_customer_wz# #wz_alloc# title="не работает"> class="err">#manager# #status_ids# diff --git a/deal.cfm b/deal.cfm index 013948e..cca2371 100644 --- a/deal.cfm +++ b/deal.cfm @@ -231,6 +231,9 @@ ,siv.params::text ,a.__id::text as additional_agreement_uid ,a.__name as additional_agreement + ,siv.end_customer as end_customer_uid + ,z.id_klienta as end_customer_wz + ,z.__name as end_customer_name ,(select sum(siv.cnt*(100-COALESCE(siv.discount,0))/100*p.price*p.cnt*(100-COALESCE(p.discount,0))/100) from elma.service_parametrs p @@ -242,6 +245,7 @@ ) as param_cnt from elma.deals_services siv left outer join elma.additional_agreements a on (a.__id=ANY(siv.additional_agreement)) + left outer join elma.companies z on (siv.end_customer=z.__id) where =ANY(siv.deal) and siv.is_actual order by version::int @@ -273,6 +277,7 @@ is_easy Компонентов additional_agreement + Конечный клиент @@ -308,8 +313,9 @@ ПростаяКомпозитнаяis_easy=#is_easy# #param_cnt# - + #additional_agreement# + #end_customer_wz# #end_customer_name# diff --git a/deal_ls.cfm b/deal_ls.cfm index eee927e..1f4365f 100644 --- a/deal_ls.cfm +++ b/deal_ls.cfm @@ -24,61 +24,49 @@ ('Закрыта неуспешно',7,0),('Закрыта успешно',6,100),('Договор подписан',5,100),('Договор на подписании',15,90),('Договор на согласовании',12,70), ('Тестирование',8,50),('Отправлено ТКП',10,20),('Внутреннее согласование',37,10),('Проработка решения',4,10),('Сбор потребностей',1,0) ), - component as (select siv.deal as deal_uids, siv.type, (siv.cnt*(100-COALESCE(siv.discount,0))/100*p.price*p.cnt*(100-COALESCE(p.discount,0))) as param_cost - from elma.deals_services siv - join elma.service_parametrs p on (p.__id = ANY(siv.params)) + end_customers_agg AS ( + SELECT + unnest(siv.deal) AS deal_id, + STRING_AGG(DISTINCT z.id_klienta, ', ') AS end_customer_wzs + FROM elma.deals_services siv + LEFT JOIN elma.companies z ON siv.end_customer = z.__id + GROUP BY unnest(siv.deal) ) select - d.__id + d.__id::text as __id d.__index d.__name - d._companies + d._companies::text as _companies d."__createdAt" as __createdAt k.__name as contragent - k.__id as contragent_uid + k.__id::text as contragent_uid k.id_klienta as wz d.__status_status s.status s.probability_pc c.__name as owner a.__name as additional_agreement - a.__id as additional_agreement_uid + a.__id::text as additional_agreement_uid g.__name as contract - g.__id as contract_uid + g.__id::text as contract_uid g.date_of_aggrement as dt_contract - - - + ec.end_customer_wzs + from elma.deals d - left outer join elma.companies k on (d._companies=k.__id) - left outer join status s on (d.__status_status=s.status_id) - left outer join elma.comp_users_ext c on (d._owner=c.__id) - left outer join elma.additional_agreements a on (d.__id=a.deal_uid) - left outer join elma.aggrements g on (a.contract_uid = g.__id) + LEFT OUTER JOIN elma.companies k on (d._companies=k.__id) + LEFT OUTER JOIN status s on (d.__status_status=s.status_id) + LEFT OUTER JOIN elma.comp_users_ext c on (d._owner=c.__id) + LEFT OUTER JOIN elma.additional_agreements a on (d.__id=a.deal_uid) + LEFT OUTER JOIN elma.aggrements g on (a.contract_uid = g.__id) + LEFT OUTER JOIN end_customers_agg ec ON (d.__id = ec.deal_id) where 1=1 order by + @@ -182,6 +170,7 @@ select count(*) as cnt from elma.deals d where 1=1 +