no message
							parent
							
								
									0b74f77e79
								
							
						
					
					
						commit
						4ef567a9f3
					
				| 
						 | 
				
			
			@ -103,7 +103,7 @@
 | 
			
		|||
 left join orders.toLocation.city.zone toZone 
 | 
			
		||||
 left join orders.routeFee
 | 
			
		||||
 WHERE pf = #{SESSION_PLATFORM}   and orders.isShortBarge=false
 | 
			
		||||
 and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME})
 | 
			
		||||
 and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME} or '财务' in (select group.name from Group group,User user where user.name=#{SESSION_USERS_NAME}  ) )
 | 
			
		||||
 and (orders.status in('AVAILABLE','TRANS_AVAILABLE') or ( /~ordersAll:  {ordersAll} = true~/  ))
 | 
			
		||||
 /~order.code: AND orders.code like {order.code}~/
 | 
			
		||||
 /~orders.customerOrderNO: AND orders.customerOrderNO like {orders.customerOrderNO}~/
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -100,7 +100,7 @@
 | 
			
		|||
 left join orders.contractor as pf
 | 
			
		||||
 left join orders.extends1 vt1 
 | 
			
		||||
 where orders.contractor = #{SESSION_PLATFORM}
 | 
			
		||||
 and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME})
 | 
			
		||||
 and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME} or '财务' in (select group.name from Group group,User user where user.name=#{SESSION_USERS_NAME}  ) )
 | 
			
		||||
 and (orders.status in('AVAILABLE','TRANS_AVAILABLE') or ( /~ordersAll:  {ordersAll} = true~/  ))
 | 
			
		||||
/~orders.customerOrderNO: AND orders.customerOrderNO like upper({orders.customerOrderNO})~/
 | 
			
		||||
/~orders.signNo: AND orders.signNo LIKE {orders.signNo}~/
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -95,7 +95,7 @@
 | 
			
		|||
 left join orders.extends1 vt1
 | 
			
		||||
 where orders.contractor = #{SESSION_PLATFORM} 
 | 
			
		||||
 and orders.status !='CANCEL'  
 | 
			
		||||
 and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME})
 | 
			
		||||
 and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME} or '财务' in (select group.name from Group group,User user where user.name=#{SESSION_USERS_NAME}  ) )
 | 
			
		||||
 and (orders.status !='SIGNED' or (/~isAll:  {isAll} = true~/))
 | 
			
		||||
 /~date1: and (DATE_FORMAT(orders.planFromDate,'%Y-%m-%d') >= #{CLIENT_DATE_SESSION} or (orders.planFromDate) >= {date1})~/
 | 
			
		||||
 /~orders.customerOrderNO: AND orders.customerOrderNO like upper({orders.customerOrderNO})~/
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -103,7 +103,7 @@
 | 
			
		|||
 left join orders.toLocation.city.zone toZone 
 | 
			
		||||
 left join orders.routeFee
 | 
			
		||||
 WHERE pf = #{SESSION_PLATFORM}   and orders.isShortBarge=false
 | 
			
		||||
 and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME})
 | 
			
		||||
 and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME} or '财务' in (select group.name from Group group,User user where user.name=#{SESSION_USERS_NAME}  ) )
 | 
			
		||||
 and (orders.status in('AVAILABLE','TRANS_AVAILABLE') or ( /~ordersAll:  {ordersAll} = true~/  ))
 | 
			
		||||
 /~order.code: AND orders.code like {order.code}~/
 | 
			
		||||
 /~orders.customerOrderNO: AND orders.customerOrderNO like {orders.customerOrderNO}~/
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -100,7 +100,7 @@
 | 
			
		|||
 left join orders.contractor as pf
 | 
			
		||||
 left join orders.extends1 vt1 
 | 
			
		||||
 where orders.contractor = #{SESSION_PLATFORM}
 | 
			
		||||
 and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME})
 | 
			
		||||
 and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME} or '财务' in (select group.name from Group group,User user where user.name=#{SESSION_USERS_NAME}  ) )
 | 
			
		||||
 and (orders.status in('AVAILABLE','TRANS_AVAILABLE') or ( /~ordersAll:  {ordersAll} = true~/  ))
 | 
			
		||||
/~orders.customerOrderNO: AND orders.customerOrderNO like upper({orders.customerOrderNO})~/
 | 
			
		||||
/~orders.signNo: AND orders.signNo LIKE {orders.signNo}~/
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -95,7 +95,7 @@
 | 
			
		|||
 left join orders.extends1 vt1
 | 
			
		||||
 where orders.contractor = #{SESSION_PLATFORM} 
 | 
			
		||||
 and orders.status !='CANCEL'  
 | 
			
		||||
 and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME})
 | 
			
		||||
 and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME} or '财务' in (select group.name from Group group,User user where user.name=#{SESSION_USERS_NAME}  ) )
 | 
			
		||||
 and (orders.status !='SIGNED' or (/~isAll:  {isAll} = true~/))
 | 
			
		||||
 /~date1: and (DATE_FORMAT(orders.planFromDate,'%Y-%m-%d') >= #{CLIENT_DATE_SESSION} or (orders.planFromDate) >= {date1})~/
 | 
			
		||||
 /~orders.customerOrderNO: AND orders.customerOrderNO like upper({orders.customerOrderNO})~/
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue