diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml index 2d612ff..300e837 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml @@ -340,6 +340,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN sys_dept sd ON moi.buyer_company = sd.dept_id WHERE md.ma_id = #{maId} + + AND moi.`code` like concat( '%',#{orderCode},'%' ) + + + AND ((md.rent_begin_time BETWEEN #{startTime} AND #{endTime}) + OR (md.rent_end_time BETWEEN #{startTime} AND #{endTime}) + OR (md.rent_begin_time < #{startTime} AND md.rent_end_time > #{endTime})) + ORDER BY moi.order_time DESC