From 4aa038d37de8be2fc26b0806cbc549da131282d2 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 20 Sep 2023 10:17:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=8C=81=E7=BB=88=E7=AB=AF=E9=A2=84?=
 =?UTF-8?q?=E9=AA=8C=E6=94=B6=E5=8D=95=E6=8D=AE=E5=85=B3=E9=94=AE=E5=AD=97?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/req/inout/FilterOrderRequest.java     | 2 ++
 src/main/resources/mybatis/mapper/inout/IoOrderDao.xml      | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
index 074af176..f92a3d6a 100644
--- a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
+++ b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
@@ -201,4 +201,6 @@ public class FilterOrderRequest extends ListPageRequest {
     private Integer confirmStatus;
     private Boolean filterSelected;
     private List<String> inOrders;
+
+    private String keyWord;
 }
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
index ffb875d8..7d430af1 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
@@ -51,6 +51,12 @@
             <if test="fromCorp != null and fromCorp != ''">
                 AND io.fromCorp = #{fromCorp}
             </if>
+            <if test="keyWord != null and keyWord != ''">
+                AND (
+                bc.name like concat('%', #{keyWord}, '%')
+                or io.remark like concat('%', #{keyWord}, '%')
+                or io.fromInvCode like concat('%', #{keyWord}, '%')  )
+            </if>
             <if test="deptCode != null and deptCode != ''">
                 AND io.deptCode = #{deptCode}
             </if>