diff --git a/v1/resources/instance_operation_cfs_subparam.cfc b/v1/resources/instance_operation_cfs_subparam.cfc index 3869d9f..52c60aa 100644 --- a/v1/resources/instance_operation_cfs_subparam.cfc +++ b/v1/resources/instance_operation_cfs_subparam.cfc @@ -78,28 +78,26 @@ - select ios.instance_operation_cfs_subparam + select count(*) as cnt from instance_operation_cfs_subparam ios where ios.instance_operation_cfs_param_uid= AND ios.instance_operation_cfs_subparam= - + - select iop.instance_operation_cfs_subparam - from instance_operation_cfs_subparam ios - join instance_operation_cfs_param iop on (ios.instance_operation_cfs_param_uid=iop.instance_operation_cfs_param_uid) + select count(*) as cnt + 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) - where ios.instance_operation_cfs_param_uid= - AND ios.instance_operation_cfs_subparam= + where iop.instance_operation_cfs_param_uid= AND si.specification_id= - - + + @@ -119,13 +117,13 @@ - - - + + + @@ -134,30 +132,28 @@ - - - select iop.instance_operation_cfs_subparam - from instance_operation_cfs_subparam iop - where iop.instance_operation_cfs_param_uid= - AND iop.instance_operation_cfs_subparam= - - - - - select iop.instance_operation_cfs_subparam - from instance_operation_cfs_subparam ios - join instance_operation_cfs_param iop on (ios.instance_operation_cfs_param_uid=iop.instance_operation_cfs_param_uid) + select count(*) as cnt + 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) where iop.instance_operation_cfs_param_uid= - AND iop.instance_operation_cfs_subparam= AND si.specification_id= - - + + + + + + select count(*) as cnt + from instance_operation_cfs_subparam iop + where iop.instance_operation_cfs_param_uid= + AND iop.instance_operation_cfs_subparam= + + + @@ -167,7 +163,7 @@ ,is_sensitive= ,note= where instance_operation_cfs_param_uid= - AND iop.instance_operation_cfs_subparam= + AND instance_operation_cfs_subparam= diff --git a/v1/resources/instance_operation_cfs_subparam_ls.cfc b/v1/resources/instance_operation_cfs_subparam_ls.cfc index 6e8401c..6938f4a 100644 --- a/v1/resources/instance_operation_cfs_subparam_ls.cfc +++ b/v1/resources/instance_operation_cfs_subparam_ls.cfc @@ -8,273 +8,77 @@ - + + + + + + - - - - - - - - - select instance_operation_cfs_subparam from - from instance_operation_cfs_subparam s - where iop.instance_operation_cfs_param_uid= - AND si.specification_id= - - - - select count(*) as cnt - from instance_operation_cfs_param iop - where iop.instance_operation_cfs_param_uid= - AND si.specification_id= - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - select - io.dt_submit, io.submit_result - from instance_operation_cfs_param iop - join instance_operation io on iop.instance_operation_uid=io.instance_operation_uid - where iop.instance_operation_cfs_param_uid= - - - - + + select count(*) as cnt + 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) + where iop.instance_operation_cfs_param_uid= + AND si.specification_id= + + + + - - delete from instance_operation_cfs_param - where instance_operation_cfs_param_uid= - - - - - - - - - - - - - - - - - - - - - - + + select count(*) as cnt + from instance_operation_cfs_subparam ios + where ios.instance_operation_cfs_param_uid= + AND ios.instance_operation_cfs_subparam= + + + + - update instance_operation_cfs_param set - dt_created= - ,creator_id= - ,param_value= - ,note= - where instance_operation_cfs_param_uid= + insert into instance_operation_cfs_subparam + (instance_operation_cfs_param_uid, instance_operation_cfs_subparam, is_sensitive, note, dt_created, creator_id, dt_updated, updater_id) + values + ( + + , + , + , + , + , + , + , + ); - - - + + + + ---> + + + - - - - - - - - select svc_operation_cfs_param_id - from instance_operation_cfs_param - where instance_operation_cfs_param_uid= - - - - - - - - - - - - - - - - - - - - - - - - select - sp.svc_operation_cfs_param_id - ,sp.svc_operation_cfs_subparam_id - ,sp.svc_operation_cfs_subparam - ,sp.label - ,sp.data_type - ,sp.value_list - ,sp.is_required - ,sp.descr - ,sp.man - ,sp.default_value - ,sp.minlength - ,sp.maxlength - ,sp.regex - ,sp.sort - ,sp.is_sensitive - from svc_operation_cfs_subparam sp - where sp.svc_operation_cfs_param_id= - order by sp.sort - - - - - select - sp.instance_operation_cfs_param_uid::text as instance_operation_cfs_param_uid - ,sp.instance_operation_cfs_subparam - ,sp.note - ,sp.sort - ,sp.is_sensitive - from instance_operation_cfs_subparam sp - where sp.instance_operation_cfs_param_uid= - order by sp.sort - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select distinct r.resource_realm, r.sort - from resource_realm r - join resource_realm_access a on - (r.resource_realm_id=a.resource_realm_id - AND (a.contract_id= - OR a.contract_id=0) /*0 means access to any contract*/ - AND a.is_enabled) - join svc s on r.resource_realm_type_id=s.resource_realm_type_id - where s.svc_id= - order by r.sort, r.resource_realm - - - \ No newline at end of file