diff --git a/Application.cfc b/Application.cfc index 99c418d..49b730a 100644 --- a/Application.cfc +++ b/Application.cfc @@ -85,36 +85,17 @@ - - - - + + + + + - - - - - - - - - - - select k.id_klienta as wz, k.__id::text as contragent_uid, k.__name as contragent + select k.id_klienta as wz, k.__id::text as contragent_uid, k.__name as contragent, + c.__name as responsible, c.email as responsible_email, c.__status_status as responsible_status from elma.companies k + LEFT OUTER JOIN elma.comp_users_ext c on (k.responsible=c.__id) where k."__deletedAt" IS NULL @@ -50,7 +52,7 @@ select k.id_klienta as wz, k.__id::text as contragent_uid, p.code, SUBSTRING(p.code FROM 1 FOR LENGTH(p.code) - 2) as sku_code, - p.price, p.discount, k.__name as contragent, a.__name as contract, a.__id::text as contract_uid, d.__name as deal, d.__id::text as deal_uid, siv.abstractive_service as abstract_service, siv.modifier, siv.user_description, siv.hash as line_key + p.price, p.discount as component_discount, k.__name as contragent, a.__name as contract, a.__id::text as contract_uid, d.__name as deal, d.__id::text as deal_uid, siv.abstractive_service as abstract_service, siv.modifier, siv.user_description, siv.hash as line_key ,siv.date_nop as serviceStart, siv.date_end as serviceEnd, siv.discount as service_discount, siv.cnt as service_quantity /*,p.__name as line_key*/, p.ed_izm, p.name as component, p.type, p.cnt*coalesce(siv.cnt,1) as component_quantity, aa.__name as additional_agreement, aa.__id::text as additional_agreement_uid @@ -368,7 +370,7 @@ SELECT m.wz as wzm s.end_customer_wz as wze coalesce(s.code, m.code) as code - s.code as s_code + s.code as s_code s.sku_code as sku_code m.code as m_code s.component_quantity @@ -377,21 +379,22 @@ SELECT coalesce(s.free_tier,0) as free_tier m.dimension1 s.type - m.unit s.ed_izm - coalesce(s.service_quantity*(100.-s.service_discount)/100.*s.price*(100.-s.discount)/100., 0.) as discounted_price - + coalesce(s.service_quantity*(100.-s.service_discount)/100.*s.price*(100.-s.component_discount)/100., 0.) as discounted_price s.serviceStart s.serviceEnd s.line_key s.price - s.discount + s.component_discount m.raw_metric m.metric c.contragent c.contragent_uid + c.responsible + c.responsible_email + c.responsible_status s.contract s.contract_uid s.additional_agreement @@ -524,21 +527,23 @@ S3 операции и трафик: #dateFormat(qS3OpsTrfAge.dt_load,'YYYY-M - + + #wz# #contragent# (сводка) + + ответственный: + class="err">#responsible# #responsible_email# - - + - - + @@ -554,7 +559,7 @@ S3 операции и трафик: #dateFormat(qS3OpsTrfAge.dt_load,'YYYY-M #unit# [#ed_izm#] #gaussianRound(discounted_price,2)# - + @@ -563,7 +568,7 @@ S3 операции и трафик: #dateFormat(qS3OpsTrfAge.dt_load,'YYYY-M #user_description# #gaussianRoundSafe(price,2)# - #discount# + #component_discount# #dateFormat(serviceStart,'YYYY-MM-DD')# #dateFormat(serviceEnd,'YYYY-MM-DD')# @@ -578,12 +583,12 @@ S3 операции и трафик: #dateFormat(qS3OpsTrfAge.dt_load,'YYYY-M #service_quantity# #service_discount# #component_quantity# - #discount# + #component_discount# #contract# #additional_agreement# #deal# - #WZE# + #WZE# @@ -598,6 +603,7 @@ S3 операции и трафик: #dateFormat(qS3OpsTrfAge.dt_load,'YYYY-M #unit# [#ed_izm#] #gaussianRoundSafe(discounted_price,2)# #gaussianRoundSafe(cost_dimension_1,2)# + @@ -606,8 +612,9 @@ S3 операции и трафик: #dateFormat(qS3OpsTrfAge.dt_load,'YYYY-M Итого #wz# #contragent#: - #accum_cost_svc# - + #accum_cost_svc# + +