|  | @@ -50,6 +50,7 @@
 | 
	
		
			
				|  |  |              <if test="fFreedays != null ">and f_freedays = #{fFreedays}</if>
 | 
	
		
			
				|  |  |              <if test="fBegindate != null ">and f_begindate = #{fBegindate}</if>
 | 
	
		
			
				|  |  |              <if test="fEnddate != null ">and f_enddate = #{fEnddate}</if>
 | 
	
		
			
				|  |  | +            <if test="fTaskType != null ">and f_task_type = #{fTaskType}</if>
 | 
	
		
			
				|  |  |              <if test="fBillstatus != null  and fBillstatus != ''">and f_billstatus = #{fBillstatus}</if>
 | 
	
		
			
				|  |  |              <if test="fStatus != null  and fStatus != ''">and f_status = #{fStatus}</if>
 | 
	
		
			
				|  |  |          </where>
 | 
	
	
		
			
				|  | @@ -85,6 +86,7 @@
 | 
	
		
			
				|  |  |              <if test="fTrademodeid != null ">and agre.f_trademodeid = #{fTrademodeid}</if>
 | 
	
		
			
				|  |  |              <if test="fFreedays != null ">and agre.f_freedays = #{fFreedays}</if>
 | 
	
		
			
				|  |  |              <if test="fBegindate != null ">and agre.f_begindate = #{fBegindate}</if>
 | 
	
		
			
				|  |  | +            <if test="fTaskType != null ">and agre.f_task_type = #{fTaskType}</if>
 | 
	
		
			
				|  |  |              <if test="fEnddate != null ">and agre.f_enddate = #{fEnddate}</if>
 | 
	
		
			
				|  |  |              <if test="fBillstatus != null  and fBillstatus != ''">and agre.f_billstatus = #{fBillstatus}</if>
 | 
	
		
			
				|  |  |              <if test="fStatus != null  and fStatus != ''">and agre.f_status = #{fStatus}</if>
 |