diff --git a/Application.cfc b/Application.cfc index 2b7537c..4ccb6bf 100644 --- a/Application.cfc +++ b/Application.cfc @@ -87,7 +87,7 @@ - + diff --git a/contract_ls.cfm b/contract_ls.cfm index 86c8ec0..6b0226e 100644 --- a/contract_ls.cfm +++ b/contract_ls.cfm @@ -30,10 +30,14 @@ d.date_of_aggrement d.date_end_aggrement d.type_of_agreement + c.__name as responsible + c.email as responsible_email + c.__status_status as responsible_status (select count(*) from elma.additional_agreements a where a.contract_uid=d.__id AND a."__deletedAt" IS NULL) as aa_cnt from elma.aggrements d - left outer join elma.companies k on (d.company_uid=k.__id) + LEFT OUTER JOIN elma.companies k ON (d.company_uid=k.__id) + LEFT OUTER JOIN elma.comp_users_ext c ON (k.responsible=c.__id) where 1=1 order by @@ -118,6 +122,9 @@ select count(*) as cnt from elma.aggrements d where 1=1 + + + diff --git a/contragent.cfm b/contragent.cfm index 8ef99ea..26450b1 100644 --- a/contragent.cfm +++ b/contragent.cfm @@ -26,14 +26,27 @@ - + + + + + select + __id, __name, _inn, _kpp, id_klienta, "__createdAt","__updatedAt","__deletedAt" + from elma.companies + where __id= + + @@ -45,14 +58,12 @@ /> - + + select c.__name as responsible, c.email as responsible_email, c.__status_status as responsible_status + from elma.companies g + LEFT OUTER JOIN elma.comp_users_ext c on (g.responsible=c.__id) + where g.__id= + - - +
Изменен
+
#dateFormat(d.__updatedAt,"YYYY-MM-DD")#
+ +
+
Удален
+
#dateFormat(d.__deletedAt,"YYYY-MM-DD")#
+
+ diff --git a/contragent_ls.cfm b/contragent_ls.cfm index 295830a..8a8aaa2 100644 --- a/contragent_ls.cfm +++ b/contragent_ls.cfm @@ -25,6 +25,9 @@ k.__index k.__name k.id_klienta as wz + c.__name as responsible + c.email as responsible_email + c.__status_status as responsible_status k."__createdAt" as __createdAt k."__updatedAt" as __updatedAt k."__deletedAt" as __deletedAt @@ -33,6 +36,7 @@ (select count(*) from elma.additional_agreements g join elma.aggrements d on (g.contract_uid=d.__id) where d.company_uid=k.__id) as aa_cnt from elma.companies k + LEFT OUTER JOIN elma.comp_users_ext c on (k.responsible=c.__id) where 1=1 --AND exists (select * from elma.deals d where d._companies=k.__id) order by @@ -108,11 +112,13 @@ select count(*) as cnt from elma.companies where 1=1 - + + + + - - + diff --git a/deal_ls.cfm b/deal_ls.cfm index 1f4365f..88fc125 100644 --- a/deal_ls.cfm +++ b/deal_ls.cfm @@ -36,8 +36,8 @@ d.__id::text as __id d.__index - d.__name - d._companies::text as _companies + d.__name + d._companies::text as _companies d."__createdAt" as __createdAt k.__name as contragent k.__id::text as contragent_uid @@ -46,6 +46,8 @@ s.status s.probability_pc c.__name as owner + c.email as owner_email + c.__status_status as owner_status a.__name as additional_agreement a.__id::text as additional_agreement_uid g.__name as contract @@ -167,6 +169,8 @@ select count(*) as cnt from elma.deals d where 1=1 + + diff --git a/test_storage_rpt.cfm b/test_storage_rpt.cfm index ee96ba2..d1cf286 100644 --- a/test_storage_rpt.cfm +++ b/test_storage_rpt.cfm @@ -12,9 +12,9 @@ SELECT - + t.name AS tenant - m.clientid AS wz + upper(m.clientid) AS wz m.status m.end_test_date null as dt_end_of_test @@ -51,7 +51,12 @@ WHERE c.timestamp >= + +SELECT upper(k.id_klienta) as wz, k.__id as id, 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) @@ -69,11 +74,31 @@ GROUP BY - + + - select * from qStorage - ORDER BY - + select + + s.tenant + s.wz + s.status + s.end_test_date + s.dt_end_of_test + s.vdc + s.provider_vdc + s.code + s.storage_profile + s.limit_gb + s.alloc_gb + s.ts + r.responsible + r.responsible_email + r.responsible_status + +from qStorage s +LEFT OUTER JOIN qResponsible r ON (s.wz=r.wz) +ORDER BY + @@ -121,6 +146,9 @@ GROUP BY + + + @@ -136,7 +164,10 @@ GROUP BY #storage_profile# b err">#limit_gb# b err">#alloc_gb# - #dateFormaT(ts,"YYYY-MM-DD")# #timeFormaT(ts,"HH-MM")# + #dateFormaT(ts,"YYYY-MM-DD")# #timeFormaT(ts,"HH-MM")# + class="err">#responsible# + class="err">#responsible_email# + class="err">#responsible_status#