From b7ac44591cde859b721022af6da98ce298a3486f Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 25 Sep 2023 16:32:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=88=86=E6=94=AF=E5=A4=87?= =?UTF-8?q?=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mybatis/mapper/inout/IoOrderDao.xml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml index 7d430af1..6270c517 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')