diff --git a/Application.cfc b/Application.cfc index 64ed68b..a6119aa 100644 --- a/Application.cfc +++ b/Application.cfc @@ -97,7 +97,7 @@ - + diff --git a/contragent.cfm b/contragent.cfm index 1a9f63b..80c1479 100644 --- a/contragent.cfm +++ b/contragent.cfm @@ -126,7 +126,148 @@ - +Договоры, допники, сделки - внизу + + + + + + + + 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 + siv.__id + ,siv.__name + ,siv.user_description + ,siv.discount + ,siv.cnt + ,siv.modifier_code + ,siv.abstractive_service_code + ,siv.is_actual + ,siv.type + ,siv.hash + ,siv.version + ,siv.name_version + ,siv.date_accept + ,siv.__index + ,siv.date_nop + ,siv.date_end + ,siv.is_easy + ,siv.params::text + ,a.__id::text as additional_agreement_uid + ,a.__name as additional_agreement + ,p.price + ,p.cnt as p_cnt + ,p.ed_izm + ,p.code + ,p.discount as p_discount + ,p.__id as p_uid + ,p.name + ,s.probability_pc + ,d.__index + ,d.__id as deal_uid + 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.additional_agreements a on (a.__id=ANY(siv.additional_agreement)) + where d._companies= + AND siv.is_actual + AND a.is_actual + order by version::int + + + +

Услуги (версии строк спецификации, только актуальные)

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
__indexuser_descriptionКомпонентыКол-воСкидка%СуммаКодtypeis_actualhashversionname_versiondate_accept__indexdate_nopdate_endis_easyadditional_agreement
#__index##user_description# + + + + + + + + + + + + + + + +
#code##name##p_cnt##ed_izm##nFmt(price,3)##p_discount#%
+
#cnt##discount#%#nFmt(cost*cnt*(100-(isNumeric(discount)?discount:0))/100)# + #abstractive_service_code#.#modifier_code# + #type##is_actual##hash##version##name_version##date_accept##__index##dateFormat(date_nop,'YYYY-MM-DD')##dateFormat(date_end,'YYYY-MM-DD')##is_easy##additional_agreement#
+ + + + + + + + select d.__id @@ -143,7 +284,7 @@ -

Договоры (#qContract.recordCount#)

+

Договоры (#qContract.recordCount#)

@@ -365,138 +506,5 @@
- - - - - - - 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 - siv.__id - ,siv.__name - ,siv.user_description - ,siv.discount - ,siv.cnt - ,siv.modifier_code - ,siv.abstractive_service_code - ,siv.is_actual - ,siv.type - ,siv.hash - ,siv.version - ,siv.name_version - ,siv.date_accept - ,siv.__index - ,siv.date_nop - ,siv.date_end - ,siv.is_easy - ,siv.params::text - ,a.__id::text as additional_agreement_uid - ,a.__name as additional_agreement - ,p.price - ,p.cnt as p_cnt - ,p.ed_izm - ,p.code - ,p.discount as p_discount - ,p.__id as p_uid - ,p.name - ,s.probability_pc - ,d.__index - ,d.__id as deal_uid - 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.additional_agreements a on (a.__id=ANY(siv.additional_agreement)) - where d._companies= - AND siv.is_actual - AND a.is_actual - order by version::int - - - -

Услуги (версии строк спецификации, только актуальные)

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
__indexuser_descriptionКомпонентыКол-воСкидка%СуммаКодtypeis_actualhashversionname_versiondate_accept__indexdate_nopdate_endis_easyadditional_agreement
#__index##user_description# - - - - - - - - - - - - - - - -
#code##name##p_cnt##ed_izm##nFmt(price,3)##p_discount#%
-
#cnt##discount#%#nFmt(cost*cnt*(100-(isNumeric(discount)?discount:0))/100)# - #abstractive_service_code#.#modifier_code# - #type##is_actual##hash##version##name_version##date_accept##__index##dateFormat(date_nop,'YYYY-MM-DD')##dateFormat(date_end,'YYYY-MM-DD')##is_easy##additional_agreement#
-
\ No newline at end of file