diff --git a/v1/resources/instance.cfc b/v1/resources/instance.cfc index 99454e5..df8fd58 100644 --- a/v1/resources/instance.cfc +++ b/v1/resources/instance.cfc @@ -33,6 +33,9 @@ i.price v.svc v.code + e.updater_id + u.login as updater_login + u.shortname as updater_shortname from instance e left outer join specification_item i on (e.specification_item_id=i.specification_item_id) @@ -40,6 +43,7 @@ left outer join contract d on (s.contract_id=d.contract_id) left outer join contragent k on (d.contragent_id=k.contragent_id) left outer join svc v on (e.service_id=v.svc_id) + left outer join usr u on (e.updater_id=u.usr_id) where e.instance_uid= AND s.specification_id= diff --git a/v1/resources/instance_ls.cfc b/v1/resources/instance_ls.cfc index 3971998..781bf18 100644 --- a/v1/resources/instance_ls.cfc +++ b/v1/resources/instance_ls.cfc @@ -96,6 +96,9 @@ i.price v.svc v.code + e.updater_id + u.login as updater_login + u.shortname as updater_shortname @@ -139,6 +142,7 @@ join contract d on (s.contract_id=d.contract_id) join contragent k on (d.contragent_id=k.contragent_id) join svc v on (e.service_id=v.svc_id) + left outer join usr u on (e.updater_id=u.usr_id) where s.specification_id= diff --git a/v1/resources/instance_operation.cfc b/v1/resources/instance_operation.cfc index 54e72ff..f9d073f 100644 --- a/v1/resources/instance_operation.cfc +++ b/v1/resources/instance_operation.cfc @@ -20,21 +20,25 @@ select - o.instance_operation_uid::text as instance_operation_uid - o.operation - o.instance_uid::text as instance_uid - to_char(o.dt_submit, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_submit - o.submit_result + o.instance_operation_uid::text as instance_operation_uid + o.operation + o.instance_uid::text as instance_uid + to_char(o.dt_submit, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_submit + o.submit_result o.error_log - to_char(o.dt_start, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_start - to_char(o.dt_finish, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_finish + to_char(o.dt_start, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_start + to_char(o.dt_finish, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_finish extract('epoch' from coalesce(o.dt_finish,CURRENT_TIMESTAMP)- o.dt_start) as duration o.is_successful - e.display_name - e.service_id - e.specification_item_id - to_char(o.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_created - v.svc + e.display_name + e.service_id + e.specification_item_id + to_char(o.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_created + to_char(o.dt_updated, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_updated + o.updater_id + u.login as updater_login + u.shortname as updater_shortname + v.svc so.svc_operation_id from instance_operation o @@ -45,6 +49,7 @@ join contragent k on (d.contragent_id=k.contragent_id) join svc v on (e.service_id=v.svc_id) join svc_operation so on (v.svc_id=so.svc_id AND o.operation=so.operation) + left outer join usr u on (o.updater_id=u.usr_id) where o.instance_operation_uid= AND s.specification_id= diff --git a/v1/resources/instance_operation_cfs_param.cfc b/v1/resources/instance_operation_cfs_param.cfc index b48a235..35d0958 100644 --- a/v1/resources/instance_operation_cfs_param.cfc +++ b/v1/resources/instance_operation_cfs_param.cfc @@ -23,20 +23,23 @@ select - iop.instance_operation_cfs_param_uid::text as instance_operation_cfs_param_uid - iop.instance_operation_uid::text as instance_operation_uid - iop.svc_operation_cfs_param_id - iop.param_value - iop.note - to_char(iop.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_created - iop.creator_id - sop.svc_operation_cfs_param + iop.instance_operation_cfs_param_uid::text as instance_operation_cfs_param_uid + iop.instance_operation_uid::text as instance_operation_uid + iop.svc_operation_cfs_param_id + iop.param_value + iop.note + to_char(iop.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_created + iop.creator_id + sop.svc_operation_cfs_param + u.login as creator_login + u.shortname as creator_shortname from instance_operation_cfs_param iop join svc_operation_cfs_param sop on (iop.svc_operation_cfs_param_id=sop.svc_operation_cfs_param_id) join instance_operation io on (iop.instance_operation_uid=io.instance_operation_uid) join instance e on (io.instance_uid=e.instance_uid) join specification_item si on (e.specification_item_id=si.specification_item_id) + left outer join usr u on (iop.creator_id=u.usr_id) where iop.instance_operation_cfs_param_uid= AND si.specification_id= diff --git a/v1/resources/instance_operation_cfs_param_ls.cfc b/v1/resources/instance_operation_cfs_param_ls.cfc index beca36c..6396398 100644 --- a/v1/resources/instance_operation_cfs_param_ls.cfc +++ b/v1/resources/instance_operation_cfs_param_ls.cfc @@ -12,9 +12,10 @@ @@ -57,16 +58,19 @@ iop.instance_operation_uid::text as instance_operation_uid iop.svc_operation_cfs_param_id iop.param_value - iop.note - to_char(iop.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_created - iop.creator_id - sop.svc_operation_cfs_param + iop.note + to_char(iop.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_created + iop.creator_id + u.login as creator_login + u.shortname as creator_shortname + sop.svc_operation_cfs_param from instance_operation_cfs_param iop join instance_operation io on (iop.instance_operation_uid=io.instance_operation_uid) join instance e on (io.instance_uid=e.instance_uid) join specification_item si on (e.specification_item_id=si.specification_item_id) join svc_operation_cfs_param sop on (iop.svc_operation_cfs_param_id=sop.svc_operation_cfs_param_id) + left outer join usr u on (iop.creator_id=u.usr_id) where iop.instance_operation_uid= AND si.specification_id=