smishchuk/svc-api-x
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

090 intermediate

Browse Source
This commit is contained in:
msyu
2025-04-17 11:51:21 +03:00
parent 0e12575f85
commit 975f2fb66f
5 changed files with 137 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v1/resources/instance_operation.cfc
+7 -4
View File
@@ -8,6 +8,8 @@
<cffunction name="get" hint="Операция над экземпляром сервиса"><!--- *** TODO проверка принадлежности тенанту --->
<cfargument name="instanceOperationUid" type="string" required=true hint="type:guid"/>
<!--- arguments.specificationId injected implicitly --->
<cftry>
<cfset this.helper.validateField(arguments, "instanceOperationUid", "guid")/>
<cfcatch type="invalidParamValue">
@@ -22,8 +24,8 @@
<m:field_set titleMapOut="local.titleMap" lengthOut="local.fieldCount">
<m:field>o.instance_operation_uid::text as instance_operation_uid</m:field>
<m:field>o.operation</m:field>
<m:field>o.resource_realm_id</m:field>
<m:field>r.resource_realm</m:field>
<!--- <m:field>o.resource_realm_id</m:field>
<m:field>r.resource_realm</m:field> --->
<m:field>o.instance_uid::text as instance_uid</m:field>
<m:field>to_char(o.dt_submit, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_submit</m:field>
<m:field>o.submit_result</m:field>
@@ -51,13 +53,15 @@
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 resource_realm r on (o.resource_realm_id=r.resource_realm_id)
<!--- left outer join resource_realm r on (o.resource_realm_id=r.resource_realm_id) --->
left outer join usr u on (o.updater_id=u.usr_id)
where <!--- u.usr_id=<cfqueryparam cfsqltype="cf_sql_integer" value=#arguments.usrId#/> AND--->
o.instance_operation_uid=<cfqueryparam cfsqltype="cf_sql_other" value="#arguments.instanceOperationUid#" null=#!isValid('guid',arguments.instanceOperationUid)#/>
AND s.specification_id=<cfqueryparam cfsqltype="cf_sql_integer" value=#arguments.specificationId#/>
</cfquery>
<!--- <cfdump var=#local.qInstanceOperation#/><cfabort/> --->
<cfif local.qInstanceOperation.recordCount EQ 0>
<cfreturn representationOf(this.helper.formatMessage("Not Found")).withStatus(404)/>
</cfif>
@@ -72,7 +76,6 @@
<m:field>to_char(ios.dt_start, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_start</m:field>
<m:field>to_char(ios.dt_finish, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_finish</m:field>
<m:field>round(extract('epoch' from coalesce(ios.dt_finish,CURRENT_TIMESTAMP)- ios.dt_start),1) as duration</m:field>
<!--- <m:field formatter=#function(x){return (deserializeJson(x))}#>ios.stage_data::text as stage_data</m:field> --->
</m:field_set>
from instance_operation_stage ios
where ios.instance_operation_uid=<cfqueryparam cfsqltype="cf_sql_other" value="#local.qInstanceOperation.instance_operation_uid#" null=#!isValid('guid',local.qInstanceOperation.instance_operation_uid)#/>