Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

云

15 小时以前 3d556b8defe1ff5b9aeb481bd1d0a67b2ded0192

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

@@ -25,17 +25,18 @@

    <select id="listPage" resultType="com.ruoyi.aftersalesservice.pojo.AfterSalesNearExpiry">
        select * from after_sales_near_expiry
        where 1 = 1
        <if test="req.expireDate != null">
            AND expire_date = #{req.expireDate}
        </if>
        <if test="req.disDate != null">
            AND dis_date = #{req.disDate}
        </if>
        <if test="req.status != null">
            AND status = #{req.status}
        </if>
        <where>
            <if test="req.expireDate != null">
                AND expire_date = #{req.expireDate}
            </if>
            <if test="req.disDate != null">
                AND dis_date = #{req.disDate}
            </if>
            <if test="req.status != null">
                AND status = #{req.status}
            </if>
        </where>
        order by create_time desc
    </select>

</mapper>
</mapper>