| 
					
				 | 
			
			
				@@ -551,7 +551,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			left join music_sheet cg ON cg.id_ = ttar.biz_id_ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		where uo.status_ = 'PAID' AND ttar.in_or_out_ = 'IN' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		AND uo.create_time_ BETWEEN #{param.startTime} AND #{param.endTime} AND ttar.teacher_id_ = #{param.teacherId} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		AND DATE_FORMAT(uo.create_time_,'%Y-%m-%d') BETWEEN #{param.startTime} AND #{param.endTime} AND ttar.teacher_id_ = #{param.teacherId} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		AND ttar.biz_type_ = #{param.type} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		UNION ALL 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		select uo.user_id_ userId,COUNT(ucar.id_) bizQuantity,SUM(ucar.trans_amount_) amount, 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -572,7 +572,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			left join music_sheet cg ON cg.id_ = ucar.biz_id_ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		where uo.status_ = 'PAID' AND ucar.in_or_out_ = 'IN' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		AND uo.create_time_ BETWEEN #{param.startTime} AND #{param.endTime} AND ucar.account_id_ = #{param.teacherId} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		AND DATE_FORMAT(uo.create_time_,'%Y-%m-%d') BETWEEN #{param.startTime} AND #{param.endTime} AND ucar.account_id_ = #{param.teacherId} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		AND ucar.biz_type_ = #{param.type} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		group by ucar.order_no_ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		order by orderTime desc 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -583,14 +583,14 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			from tenant_teacher_account_record ttar 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			left join user_order uo ON uo.order_no_ = ttar.order_no_ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			where uo.status_ = 'PAID' AND ttar.in_or_out_ = 'IN' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			  AND uo.create_time_ BETWEEN #{param.startTime} AND #{param.endTime} AND ttar.teacher_id_ = #{param.teacherId} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			  AND DATE_FORMAT(uo.create_time_,'%Y-%m-%d') BETWEEN #{param.startTime} AND #{param.endTime} AND ttar.teacher_id_ = #{param.teacherId} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			  AND ttar.biz_type_ = #{param.type} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			UNION ALL 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			select SUM(ucar.trans_amount_) amount 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			from user_cash_account_record ucar 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			left join user_order uo ON uo.order_no_ = ucar.order_no_ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			where uo.status_ = 'PAID' AND ucar.in_or_out_ = 'IN' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			  AND uo.create_time_ BETWEEN #{param.startTime} AND #{param.endTime} AND ucar.account_id_ = #{param.teacherId} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			  AND DATE_FORMAT(uo.create_time_,'%Y-%m-%d') BETWEEN #{param.startTime} AND #{param.endTime} AND ucar.account_id_ = #{param.teacherId} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			  AND ucar.biz_type_ = #{param.type} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			) a 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	</select> 
			 |