Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

yuan

45 分钟以前 c0fe393c6a5877076a7b5646b3aee01448e84a98

 src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml

@@ -11,6 +11,12 @@
        <if test="req.feedbackDate != null">
            AND feedback_date BETWEEN #{req.feedbackDate} AND #{req.feedbackDate}
        </if>
        <if test="req.afterSalesServiceNo != null and req.afterSalesServiceNo != ''">
            AND ass.after_sales_service_no like CONCAT('%', #{req.afterSalesServiceNo}, '%')
        </if>
        <if test="req.orderNo != null and req.orderNo != '' ">
            AND sl.sales_contract_no like CONCAT('%', #{req.orderNo}, '%')
        </if>
        <if test="req.disDate != null">
            AND dis_date BETWEEN #{req.disDate} AND #{req.disDate}
        </if>