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

172 instance_operation_ls paging bug fix

Browse Source
This commit is contained in:
smishchuk
2025-11-20 14:58:43 +03:00
parent 210560d973
commit 503df018aa
4 changed files with 68 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v1/resources/instance_operation_ls.cfc
+39 -24
View File
@@ -12,7 +12,11 @@
"dt_created"={prefix="o", type="date"},
"dt_updated"={prefix="o", type="date"},
"creator_id"={prefix="o", type="integer"},
"creator_email"={prefix="c", column="email", type="string"},
"creator_shortname"={prefix="c", column="shortname", type="string"},
"updater_id"={prefix="o", type="integer"},
"updater_email"={prefix="u", column="email", type="string"},
"updater_shortname"={prefix="u", column="shortname", type="string"},
"dt_submit"={prefix="o", type="date"},
"submit_result"={prefix="o", type="string"},
"dt_start"={prefix="o", type="date"},
@@ -34,8 +38,9 @@
<cfargument name="page" type="string" hint="type:integer" default="1"/>
<cfargument name="orderBy" type="string" hint="type:string, description:comma-separated list of fields to sort by, example:fld1.ASC,fld2.DESC,fld3.ASC" default=""/>
<cfset var local={}/>
<cftry> <!--- отладка на время проблемы 404 --->
<cfset local={}/>
<!---parse and validate request parameters--->
<cftry>
@@ -53,12 +58,7 @@
<cfreturn representationOf(cfcatch)/>
</cfcatch>
</cftry>
<cfset var out={}/>
<cfset var maxrows=arguments.pageSize*arguments.page/>
<cfset var startrow=arguments.pageSize*(arguments.page-1)+1/>
<!--- <cfset request.locateIamService()/> --->
<cfquery name="local.qRead" result="local.result">
select
@@ -89,50 +89,65 @@
<m:field>u.email as updater_email</m:field>
<m:field>u.shortname as updater_shortname</m:field>
</m:field_set>
from instance_operation o
join instance e on (o.instance_uid=e.instance_uid)
left outer join specification_item i on (e.specification_item_id=i.specification_item_id)
left outer join specification s on (i.specification_id=s.specification_id)
left outer join contract d on (s.contract_id=d.contract_id)
left outer join svc v on (e.service_id=v.svc_id)
left outer join usr c on (e.creator_id=c.usr_id)
left outer join usr u on (e.updater_id=u.usr_id)
<cfsavecontent variable="local.fromClause">
from instance_operation o
join instance e on (o.instance_uid=e.instance_uid)
left outer join specification_item i on (e.specification_item_id=i.specification_item_id)
left outer join specification s on (i.specification_id=s.specification_id)
left outer join contract d on (s.contract_id=d.contract_id)
left outer join svc v on (e.service_id=v.svc_id)
left outer join usr c on (e.creator_id=c.usr_id)
left outer join usr u on (e.updater_id=u.usr_id)
</cfsavecontent>#local.fromClause#
where
s.specification_id=<cfqueryparam cfsqltype="cf_sql_integer" value=#arguments.specificationId#/>
<m:filter_build filter=#filter#/>
order by
<m:order_build sortCollection=#this.helper.parseNumericOrder(local.titleMap, arguments.orderBy)# fieldCount=0/><!---no sort length limit--->
limit #maxrows#
<cfif arguments.pageSize GT 0>
limit #arguments.pageSize#
offset #arguments.pageSize*(arguments.page-1)#
</cfif>
</cfquery>
<!--- <cfdump var=#local.qRead#/><cfabort/> --->
<!--- <cfdump var=#local.qRead#/><cfabort/> --->
<cfquery name="local.qCnt">
select count(*) as cnt
#local.fromClause#
where
s.specification_id=<cfqueryparam cfsqltype="cf_sql_integer" value=#arguments.specificationId#/>
<m:filter_build filter=#filter#/>
</cfquery>
<cfquery name="local.qTotal">
select count(*) as cnt
from instance_operation o
#local.fromClause#
<!--- from instance_operation o
join instance e on (o.instance_uid=e.instance_uid)
left outer join specification_item i on (e.specification_item_id=i.specification_item_id)
left outer join specification s on (i.specification_id=s.specification_id)
left outer join specification s on (i.specification_id=s.specification_id) --->
where
s.specification_id=<cfqueryparam cfsqltype="cf_sql_integer" value=#arguments.specificationId#/>
</cfquery>
<cfset var out=structNew("linked")/>
<cfset "out.queryDurationMs"=getTickCount() - request.startTickCount/>
<cfset "out.total"=#local.qTotal.cnt#/>
<cfset "out.resultSetSize"=#local.qRead.recordCount#/>
<cfset "out.resultSetSize"=#local.qCnt.cnt#/>
<cfset "out.pageSize"=#arguments.pageSize*1#/>
<cfset "out.page"=#arguments.page*1#/>
<cfset "out.orderBy"=#arguments.orderBy#/>
<cfset "out.orderBy"=#arguments.orderBy#/>
<cfset var resultCollection=[]/>
<cfloop query=#local.qRead# startRow=#startrow# endRow=#(startrow+maxrows-1)#>
<cfloop query=#local.qRead#>
<cfset var rec=structNew("linked")/>
<cfset this.helper.appendRecord(rec, "", local.titleMap, local.qRead, this.helper.snake2camel)/>
<cfset arrayAppend(resultCollection, rec)/>
</cfloop>
<cfset "out.size"=#arrayLen(resultCollection)#/>
<cfset "out.results"=#resultCollection#/>
<cfset "out.size"=#arrayLen(resultCollection)#/>
<cfset "out.results"=#resultCollection#/>
<cfset "out.runDurationMs"=getTickCount()-request.startTickCount/>
<!---<cfset "out.sql"=#local.result.sql#/>--->
<cfreturn representationOf(out)/>