diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml index 7d430af18..6270c5172 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml @@ -53,9 +53,9 @@ AND ( - bc.name like concat('%', #{keyWord}, '%') - or io.remark like concat('%', #{keyWord}, '%') - or io.fromInvCode like concat('%', #{keyWord}, '%') ) + bc.name like concat('%', #{keyWord}, '%') + or io.remark like concat('%', #{keyWord}, '%') + or io.fromInvCode like concat('%', #{keyWord}, '%')) AND io.deptCode = #{deptCode} @@ -75,6 +75,10 @@ AND io.preInSelected is null + + + AND io.preInSelected is not null + AND date_format(io.createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')