From 68bf3f9056812bdf52cb6db1965076a87f39e815 Mon Sep 17 00:00:00 2001 From: msyu Date: Mon, 8 Sep 2025 21:52:46 +0300 Subject: [PATCH] 139 dependencies 2 way --- v1/Application.cfc | 2 +- v1/resources/instance.cfc | 85 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 82 insertions(+), 5 deletions(-) diff --git a/v1/Application.cfc b/v1/Application.cfc index 0071f50..2e26e3f 100644 --- a/v1/Application.cfc +++ b/v1/Application.cfc @@ -51,7 +51,7 @@ //variables.framework.docs={}; variables.framework.docs.APIName="svc-api"; - variables.framework.docs.APIVersion="0.138"; /*dependencies*/ /*$ git config --global --unset user.password*/ + variables.framework.docs.APIVersion="0.139"; /*dependencies*/ /*$ git config --global --unset user.password*/ variables.framework.globalHeaders = structNew(); variables.framework.globalHeaders["Access-Control-Expose-Headers"] = "Location"; diff --git a/v1/resources/instance.cfc b/v1/resources/instance.cfc index ee8dfe4..fd39e0d 100644 --- a/v1/resources/instance.cfc +++ b/v1/resources/instance.cfc @@ -189,7 +189,7 @@ ---> - + - + + ---> + + + select + + p.param + sop.descr + s.svc_id + s.svc + s.code + sop.label + p.param_value as uid + e.display_name + e.is_auxiliary + c.contract_id + c.contract + to_char(c.dt_contract, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_contract + k.external_code + + from instance_cfs_param p + left outer join instance_operation_cfs_param iop on (p.instance_operation_cfs_param_uid=iop.instance_operation_cfs_param_uid) + left outer join instance_operation o on (iop.instance_operation_uid=o.instance_operation_uid) + left outer join instance e on (o.instance_uid=e.instance_uid) + left outer join svc_operation so on (o.operation=so.operation AND e.service_id=so.svc_id) + left outer join svc_operation_cfs_param sop on (so.svc_operation_id=sop.svc_operation_id AND p.param=sop.svc_operation_cfs_param) + left outer join svc s on (sop.ref_svc_id=s.svc_id) + left outer join specification_item si on (e.specification_item_id=si.specification_item_id) + left outer join specification sp on (si.specification_id=sp.specification_id) + left outer join contract c on (sp.contract_id=c.contract_id) + left outer join contragent k on (c.contragent_id=k.contragent_id) + where p.instance_uid= + AND sop.ref_svc_id > 0 + order by sop.sort, p.param + + + + select + + p.param + sop.descr + s.svc_id + s.svc + s.code + sop.label + e.instance_uid::text as uid + e.display_name + e.is_auxiliary + c.contract_id + c.contract + to_char(c.dt_contract, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_contract + k.external_code + + from instance_cfs_param p + left outer join instance_operation_cfs_param iop on (p.instance_operation_cfs_param_uid=iop.instance_operation_cfs_param_uid) + left outer join instance_operation o on (iop.instance_operation_uid=o.instance_operation_uid) + left outer join instance e on (o.instance_uid=e.instance_uid) + left outer join svc s on (e.service_id=s.svc_id) + left outer join svc_operation so on (o.operation=so.operation AND e.service_id=so.svc_id) + left outer join svc_operation_cfs_param sop on (so.svc_operation_id=sop.svc_operation_id AND p.param=sop.svc_operation_cfs_param) + left outer join svc r on (sop.ref_svc_id=r.svc_id) + left outer join specification_item si on (e.specification_item_id=si.specification_item_id) + left outer join specification sp on (si.specification_id=sp.specification_id) + left outer join contract c on (sp.contract_id=c.contract_id) + left outer join contragent k on (c.contragent_id=k.contragent_id) + where + p.param_value= + AND r.svc_id=(select i.service_id from instance i where i.instance_uid=) + + @@ -380,8 +448,17 @@ - + + + + + + + + + +