|  |  |  | @ -29,6 +29,9 @@ | 
			
		
	
		
			
				
					|  |  |  |  |             <if test="action != null and action != ''"> | 
			
		
	
		
			
				
					|  |  |  |  |                 AND action = #{action} | 
			
		
	
		
			
				
					|  |  |  |  |             </if> | 
			
		
	
		
			
				
					|  |  |  |  |             <if test="remark != null and remark != ''"> | 
			
		
	
		
			
				
					|  |  |  |  |                 AND remark  like concat('%', #{remark}, '%') | 
			
		
	
		
			
				
					|  |  |  |  |             </if> | 
			
		
	
		
			
				
					|  |  |  |  |             <if test="mainAction != null and mainAction != ''"> | 
			
		
	
		
			
				
					|  |  |  |  |                 AND mainAction = #{mainAction} | 
			
		
	
		
			
				
					|  |  |  |  |             </if> | 
			
		
	
	
		
			
				
					|  |  |  | @ -77,7 +80,10 @@ | 
			
		
	
		
			
				
					|  |  |  |  |                     #{item} | 
			
		
	
		
			
				
					|  |  |  |  |                 </foreach> | 
			
		
	
		
			
				
					|  |  |  |  |             </if> | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |             <if test="unionRemark != null and unionRemark != ''"> | 
			
		
	
		
			
				
					|  |  |  |  |                 AND (io.remark like concat('%', #{unionRemark}, '%') | 
			
		
	
		
			
				
					|  |  |  |  |                         or io.outSickInfo like concat('%', #{unionRemark}, '%')) | 
			
		
	
		
			
				
					|  |  |  |  |             </if> | 
			
		
	
		
			
				
					|  |  |  |  |             <if test="statuses != null and statuses.size() != 0"> | 
			
		
	
		
			
				
					|  |  |  |  |                 AND status in | 
			
		
	
		
			
				
					|  |  |  |  |                 <foreach collection="statuses" index="index" item="item" open="(" close=")" separator=","> | 
			
		
	
	
		
			
				
					|  |  |  | @ -139,7 +145,7 @@ | 
			
		
	
		
			
				
					|  |  |  |  |             </if> | 
			
		
	
		
			
				
					|  |  |  |  |         </where> | 
			
		
	
		
			
				
					|  |  |  |  |         <choose> | 
			
		
	
		
			
				
					|  |  |  |  |             <when test="(orderBy!=null ) and (sort=='desc' or sort=='asc')"> | 
			
		
	
		
			
				
					|  |  |  |  |             <when test="(orderBy != null) and (sort == 'desc' or sort == 'asc')"> | 
			
		
	
		
			
				
					|  |  |  |  |                 order by ${orderBy} ${sort} | 
			
		
	
		
			
				
					|  |  |  |  |             </when> | 
			
		
	
		
			
				
					|  |  |  |  |             <otherwise> | 
			
		
	
	
		
			
				
					|  |  |  | @ -294,7 +300,7 @@ | 
			
		
	
		
			
				
					|  |  |  |  |             </if> | 
			
		
	
		
			
				
					|  |  |  |  |         </where> | 
			
		
	
		
			
				
					|  |  |  |  |         <choose> | 
			
		
	
		
			
				
					|  |  |  |  |             <when test="(orderBy!=null ) and (sort=='desc' or sort=='asc')"> | 
			
		
	
		
			
				
					|  |  |  |  |             <when test="(orderBy != null) and (sort == 'desc' or sort == 'asc')"> | 
			
		
	
		
			
				
					|  |  |  |  |                 order by ${orderBy} ${sort} | 
			
		
	
		
			
				
					|  |  |  |  |             </when> | 
			
		
	
		
			
				
					|  |  |  |  |             <otherwise> | 
			
		
	
	
		
			
				
					|  |  |  | @ -340,6 +346,10 @@ | 
			
		
	
		
			
				
					|  |  |  |  |             <if test="syncStatus != null"> | 
			
		
	
		
			
				
					|  |  |  |  |                 AND syncStatus = #{syncStatus} | 
			
		
	
		
			
				
					|  |  |  |  |             </if> | 
			
		
	
		
			
				
					|  |  |  |  |             <if test="unionRemark != null and unionRemark != ''"> | 
			
		
	
		
			
				
					|  |  |  |  |                 AND (io.remark like concat('%', #{unionRemark}, '%') | 
			
		
	
		
			
				
					|  |  |  |  |                 or io.outSickInfo like concat('%', #{unionRemark}, '%')) | 
			
		
	
		
			
				
					|  |  |  |  |             </if> | 
			
		
	
		
			
				
					|  |  |  |  |             <if test="busType != null"> | 
			
		
	
		
			
				
					|  |  |  |  |                 AND busType = #{busType} | 
			
		
	
		
			
				
					|  |  |  |  |             </if> | 
			
		
	
	
		
			
				
					|  |  |  | @ -441,7 +451,7 @@ | 
			
		
	
		
			
				
					|  |  |  |  |             <if test="thirdSys != null and thirdSys != ''"> | 
			
		
	
		
			
				
					|  |  |  |  |                 AND t1.thirdSys = #{thirdSys} | 
			
		
	
		
			
				
					|  |  |  |  |             </if> | 
			
		
	
		
			
				
					|  |  |  |  |             <if test="orderStartTime != null "> | 
			
		
	
		
			
				
					|  |  |  |  |             <if test="orderStartTime != null"> | 
			
		
	
		
			
				
					|  |  |  |  |                 <![CDATA[ | 
			
		
	
		
			
				
					|  |  |  |  |                 and updateTime >= DATE_FORMAT(#{orderStartTime}, '%Y-%m-%d %H:%i:%S') | 
			
		
	
		
			
				
					|  |  |  |  |                 ]]> | 
			
		
	
	
		
			
				
					|  |  |  | @ -466,7 +476,7 @@ | 
			
		
	
		
			
				
					|  |  |  |  |                      LEFT JOIN basic_bussiness_type ON io_order.action = basic_bussiness_type.action | 
			
		
	
		
			
				
					|  |  |  |  |         WHERE basic_bussiness_type.inStock = 1 | 
			
		
	
		
			
				
					|  |  |  |  |           and io_order.`status` = 7 | 
			
		
	
		
			
				
					|  |  |  |  |           AND date_format(io_order.updateTime, '%Y-%m-%d') = date_format(#{data},'%Y-%m-%d') | 
			
		
	
		
			
				
					|  |  |  |  |           AND date_format(io_order.updateTime, '%Y-%m-%d') = date_format(#{data}, '%Y-%m-%d') | 
			
		
	
		
			
				
					|  |  |  |  |     </select> | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |     <select id="selectOrderfirstAndLastIdList" resultType="java.lang.String"> | 
			
		
	
	
		
			
				
					|  |  |  | @ -506,6 +516,10 @@ | 
			
		
	
		
			
				
					|  |  |  |  |             <if test="mainAction != null and mainAction != ''"> | 
			
		
	
		
			
				
					|  |  |  |  |                 AND io.mainAction = #{mainAction} | 
			
		
	
		
			
				
					|  |  |  |  |             </if> | 
			
		
	
		
			
				
					|  |  |  |  |             <if test="unionRemark != null and unionRemark != ''"> | 
			
		
	
		
			
				
					|  |  |  |  |                 AND (io.remark like concat('%', #{unionRemark}, '%') | 
			
		
	
		
			
				
					|  |  |  |  |                         or io.outSickInfo like concat('%', #{unionRemark}, '%')) | 
			
		
	
		
			
				
					|  |  |  |  |             </if> | 
			
		
	
		
			
				
					|  |  |  |  |             <if test="billNo != null and billNo != ''"> | 
			
		
	
		
			
				
					|  |  |  |  |                 AND io.billNo like concat('%', #{billNo}, '%') | 
			
		
	
		
			
				
					|  |  |  |  |             </if> | 
			
		
	
	
		
			
				
					|  |  |  | 
 |