diff --git a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml index d6ea0cb5a..6f2eaad05 100644 --- a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml @@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and entry_date = #{entryDate} and confirm_status=#{confirmStatus} and confirm_date = #{confirmDate} - and used_status= #{usedStatus} + and status=#{status} and remark like concat('%', #{remark}, '%') and tenant_id like concat('%', #{tenantId}, '%') @@ -49,6 +49,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and update_time = #{updateTime} and create_site like concat('%', #{createSite}, '%') and update_site like concat('%', #{updateSite}, '%') + + + and used_status= '1' + + + + and used_status= '0' + + + order by create_time desc