|  |  | @ -24,17 +24,20 @@ | 
			
		
	
		
		
			
				
					
					|  |  |  |     </select> |  |  |  |     </select> | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |     <select id="filterOrderList" resultType="com.glxp.api.res.inout.IoOrderDetailResultResponse"> |  |  |  |     <select id="filterOrderList" resultType="com.glxp.api.res.inout.IoOrderDetailResultResponse"> | 
			
		
	
		
		
			
				
					
					|  |  |  |         SELECT a2.*, |  |  |  |         SELECT | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |         a2.*, | 
			
		
	
		
		
			
				
					
					|  |  |  |         a1.mainAction, |  |  |  |         a1.mainAction, | 
			
		
	
		
		
			
				
					
					|  |  |  |         GROUP_CONCAT(ioi.invoiceEncode ORDER BY ioi.invoiceEncode SEPARATOR ',') as invoiceCodes, |  |  |  |         bu.isStack, | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  |         b1.NAME AS                                                               fromCorpName, |  |  |  |         GROUP_CONCAT( ioi.invoiceEncode ORDER BY ioi.invoiceEncode SEPARATOR ',' ) AS invoiceCodes, | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  |         (SELECT NAME FROM basic_bussiness_type bus WHERE bus.action = a1.action) billTypeName |  |  |  |         b1.NAME AS fromCorpName | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  |         FROM io_order_detail_result a2 |  |  |  |         ,basic_bussiness_type.name billTypeName | 
			
				
				
			
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |         FROM | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |         io_order_detail_result a2 | 
			
		
	
		
		
			
				
					
					|  |  |  |         LEFT JOIN io_order a1 ON a1.billNo = a2.orderIdFk |  |  |  |         LEFT JOIN io_order a1 ON a1.billNo = a2.orderIdFk | 
			
		
	
		
		
			
				
					
					|  |  |  |         LEFT JOIN basic_corp b1 ON b1.erpId = a1.fromCorp |  |  |  |         LEFT JOIN basic_corp b1 ON b1.erpId = a1.fromCorp | 
			
		
	
		
		
			
				
					
					|  |  |  |         left join basic_udirel bu on a2.bindRlFk = bu.id |  |  |  |         LEFT JOIN basic_udirel bu ON a2.bindRlFk = bu.id | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  |         left join io_order_invoice ioi on a1.billNo = ioi.orderIdFk |  |  |  |         left join basic_bussiness_type on a1.action = basic_bussiness_type.action | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  |         LEFT JOIN io_order_invoice ioi ON a1.billNo = ioi.orderIdFk | 
			
				
				
			
		
	
		
		
	
		
		
	
		
		
	
		
		
			
				
					
					|  |  |  |         <where> |  |  |  |         <where> | 
			
		
	
		
		
			
				
					
					|  |  |  |             a1.status = 7 |  |  |  |             a1.status = 7 | 
			
		
	
		
		
			
				
					
					|  |  |  |             <if test="orderIdFk != null and orderIdFk != ''"> |  |  |  |             <if test="orderIdFk != null and orderIdFk != ''"> | 
			
		
	
	
		
		
			
				
					|  |  | 
 |