diff --git a/Application.cfc b/Application.cfc index dac1cde..dea3149 100644 --- a/Application.cfc +++ b/Application.cfc @@ -87,7 +87,7 @@ - + diff --git a/test_storage_rpt.cfm b/test_storage_rpt.cfm index fb60bda..6402844 100644 --- a/test_storage_rpt.cfm +++ b/test_storage_rpt.cfm @@ -59,29 +59,42 @@ SELECT upper(k.id_klienta) as wz, k.__id as id, c.__name as responsible, c.email LEFT OUTER JOIN elma.comp_users_ext c on (k.responsible=c.__id) - + WITH status(status, status_id, probability_pc) AS (VALUES ('Закрыта неуспешно',7,0),('Закрыта успешно',6,100),('Договор подписан',5,100),('Договор на подписании',15,90),('Договор на согласовании',12,70), ('Тестирование',8,50),('Отправлено ТКП',10,20),('Внутреннее согласование',37,10),('Проработка решения',4,10),('Сбор потребностей',1,0) - ) -select z.id_Klienta as wz, z.__name as company, -d.__id as deal_uid, d.__status_status as status_id, s.status, d.__index as deal_index, d.__name as deal --, d.kommentarii_k_sdelke, d."__statusComment" -from elma.companies z -join (select - __id, _companies, __status_status, __index, __name, kommentarii_k_sdelke, "__statusComment", "__deletedAt", is_corrective_transaction - ,ROW_NUMBER() OVER (PARTITION BY _companies ORDER BY __index desc) rn -from elma.deals) d on (z.__id=d._companies AND d.rn=1) -join status s on (d.__status_status=s.status_id) + ), + current_deal + AS (select + d.__id, d._companies, d.__status_status, d.__index, d.__name, d.kommentarii_k_sdelke, d."__statusComment", d."__deletedAt", d.is_corrective_transaction, + a.__id as additional_agreement_uid, a.__name as additional_agreement, + g.__id as contract_uid, g.__name as contract, g.date_of_aggrement as dt_contract, g.agreement_id as contract_id /*сохранена авторская орфография*/ + ,ROW_NUMBER() OVER (PARTITION BY _companies ORDER BY d.__index DESC) rn + from elma.deals d + join status s on (d.__status_status=s.status_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) + where d."__deletedAt" IS NULL AND s.probability_pc > 0 + AND NOT coalesce(d.is_corrective_transaction, false) + AND NOT d.__status_status=7 + ) -where z."__deletedAt" IS NULL AND d."__deletedAt" IS NULL -AND NOT coalesce(d.is_corrective_transaction, false) -AND NOT d.__status_status=7 -order by z.id_Klienta, d.__index DESC +SELECT z.id_klienta as wz, z.__name as company, +d.__id::text as deal_uid, d.__status_status as status_id, s.status, d.__index as deal_index, d.__name as deal, +d.additional_agreement_uid::text as additional_agreement_uid, d.additional_agreement, +d.contract_uid::text as contract_uid, d.contract, d.dt_contract, d.contract_id +FROM elma.companies z +LEFT JOIN current_deal d ON (z.__id=d._companies AND d.rn=1) +LEFT JOIN status s ON (d.__status_status=s.status_id) +where z."__deletedAt" IS NULL + +ORDER BY z.id_klienta, d.__index DESC - - + + @@ -97,14 +110,14 @@ order by z.id_Klienta, d.__index DESC - + select s.tenant s.wz - s.status + s.status s.end_test_date s.dt_end_of_test s.vdc @@ -118,15 +131,22 @@ order by z.id_Klienta, d.__index DESC r.responsible_email r.responsible_status - d.deal_uid + d.deal_uid d.deal_index d.deal d.status_id d.status as deal_status + + d.additional_agreement_uid + d.additional_agreement + d.contract_uid + d.contract + d.dt_contract + d.contract_id from qStorage s LEFT OUTER JOIN qResponsible r ON (s.wz=r.wz) -LEFT OUTER JOIN qLastDeal d ON (s.wz=d.wz) +LEFT OUTER JOIN qCurrentDeal d ON (s.wz=d.wz) ORDER BY @@ -173,6 +193,10 @@ ORDER BY + + + + @@ -184,17 +208,22 @@ ORDER BY + -#wz# + #wz# #tenant# class="b">#status# b err">#dateFormat(dt_end_of_test,"YYYY-MM-DD")# #deal# - #deal_status# + #deal_status# [#status_id#] + + #additional_agreement# + #contract# (#contract_id#) + #dateFormat(dt_contract,"DD.MM.YYYY")# #VDC# #provider_vdc#