068

v1/resources/instance_operation_run.cfc

@@ -128,7 +128,10 @@
 		<!--- поступим проще, по engine/generate_rfs_12.cfm --->
 		<cfset setInstanceOperationRfsParam(arguments.instanceOperationUid, "instanceUid", qSvcOperation.instance_uid)/>
 		<cfset setInstanceOperationRfsParam(arguments.instanceOperationUid, "operationUid", arguments.instanceOperationUid)/>
-		<cfset setInstanceOperationRfsParam(arguments.instanceOperationUid, "modifierId", #arguments.usrId#)/>
+		<cfset setInstanceOperationRfsParam(arguments.instanceOperationUid, "modifierId", arguments.usrId)/>
+		<cfset setInstanceOperationRfsParam(arguments.instanceOperationUid, "contragentId", arguments.contragentId)/>
+		<cfset setInstanceOperationRfsParam(arguments.instanceOperationUid, "contractId", arguments.contractId)/>
+		<cfset setInstanceOperationRfsParam(arguments.instanceOperationUid, "contragentCode", getContragentCode(arguments.contragentId))/>
 
 		<cfquery name="qWriteRfsFromCfsParams">
 			insert into instance_operation_param (instance_operation_uid,param,param_value)
@@ -187,8 +190,7 @@
 			set dt_submit=<cfqueryparam cfsqltype="cf_sql_timestamp" value=#now()#/>
 			,dt_start=null, dt_finish=null, submit_result='0'
 			where instance_operation_uid=<cfqueryparam cfsqltype="cf_sql_other" value=#arguments.instanceOperationUid#/>
-		</cfquery>
-		
+		</cfquery>		
 		
 		
 		<cftry>
@@ -254,8 +256,7 @@
 					<cfrethrow/><!--- пока не придумал --->
 				</cfcatch>
 			</cftry>		
-		</cfif>		
-		
+		</cfif>				
 	</cffunction>
 	
 	<!--- *** судя по всему, RFS параметр не обязан быть специфицирован на сервисе (никак не проверяется) --->
@@ -304,5 +305,17 @@
 			</cfcatch>
 		</cftry>
 	</cffunction>
+	
+	<cffunction name="getContragentCode">
+		<cfargument name="contragentId">	
+		
+		<cfquery name="qContragentCode">
+			select contragent_code 
+			from contragent
+			where contragent_id=<cfqueryparam cfsqltype="cf_sql_integer" value=#arguments.contragentId# null=#!isNumeric(arguments.contragentId)#/>
+		</cfquery>
+	
+		<cfreturn #qContragentCode.contragent_code#/>
+	</cffunction>
 
 </cfcomponent>

v1/resources/notification_ls.cfc

@@ -7,10 +7,14 @@
 
 	<!---спецификация полей, пригодных для фильтрации (?и сортировки)--->
 	<cfset this.fieldsSpec={
-		dt_created={prefix="s", type="date"},
-		dt_updated={prefix="s", type="date"},
-		svc_id={prefix="s", type="integer"},
-		svc={prefix="s", type="string"}
+		dt_created={prefix="n", type="date"},
+		dt_updated={prefix="n", type="date"},
+		dt_show_from={prefix="n", type="date"},
+		dt_show_to={prefix="n", type="date"},
+		contragent_id={prefix="n", type="integer"},
+		timeout_sec={prefix="n", type="integer"},
+		external_uid={prefix="n", type="guid"},
+		external_code={prefix="n", type="string"}
 	}
 	/>
 
@@ -53,6 +57,8 @@
 					<m:field>n.notification_uid::text as notification_uid</m:field>
 					<m:field>n.notification</m:field>
 					<m:field>n.descr</m:field>
+					<m:field>n.url</m:field>
+					<m:field>n.timeout_sec</m:field>
 					<m:field>n.contragent_id</m:field>
 					<m:field>k.external_uid</m:field>
 					<!--- <m:field><cfqueryparam cfsqltype="cf_sql_other" value=#arguments.companyUid#/> as arguments_company_uid</m:field> --->
@@ -69,8 +75,9 @@
 				AND (k.external_uid = <cfqueryparam cfsqltype="cf_sql_other" value=#arguments.companyUid#/> OR n.contragent_id IS NULL)
 				order by dt_show_from desc
 				<!--- <m:order_build sortCollection=#this.helper.parseNumericOrder(local.titleMap, arguments.orderBy)# fieldCount=0/>--->
-				--limit #maxrows#
-			</cfquery>  
+				limit #maxrows#
+			</cfquery>
+			<!--- <cfdump var=#local.qRead#/><cfabort/> --->			
 			
 
 			<cfquery name="local.qTotal">