Merge branch 'master' into 外协收回按炉结算判断

src/main/resources/mybatis/business/BizOutsourceBalanceAccountMapper.xml

@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="wastePrice != null "> AND waste_price = #{wastePrice}</if>
             <if test="carrierNum != null "> AND carrier_num = #{carrierNum}</if>
             <if test="processSort != null "> AND process_sort = #{processSort}</if>
-            <if test="checkoutDate != null "> AND (checkout_date &lt;= #{checkoutDate} or checkout_date is null)</if>
+            <if test="checkoutDate != null "> AND (date_format(checkout_date,'%y%m%d') &lt;= date_format(#{checkoutDate},'%y%m%d') or checkout_date is null)</if>
             <if test="auditDate != null "> AND audit_date = #{auditDate}</if>
             <if test="returnDate != null "> AND return_date = #{returnDate}</if>
             <if test="returnNo != null  and returnNo != ''"> AND return_no = #{returnNo}</if>