From 6b6280852fd732c1bb110b9a58aec738ade8a28d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com>
Date: Thu, 20 Jul 2023 18:36:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/req/inout/FilterOrderRequest.java     |  1 +
 .../mybatis/mapper/inout/IoOrderDao.xml       | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

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 84c717d56..a050b9244 100644
--- a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
+++ b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
@@ -197,5 +197,6 @@ public class FilterOrderRequest extends ListPageRequest {
     private String unionRemark;
 
     private String remark;
+    private String keyWords;
     private Integer confirmStatus;
 }
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
index d12eb1efe..2146274ec 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
@@ -15,6 +15,9 @@
                (select name from basic_corp bc where bc.erpId = io.fromCorp)            fromCorpName,
                (select name from basic_corp bc where bc.erpId = io.customerId)          customerName
                 from io_order as io
+                left join auth_warehouse aw on aw.code = io.fromInvCode
+                left join basic_corp bc on bc.erpId = io.fromCorp
+
         <if test="uploadKey != null and uploadKey != ''">
             INNER JOIN io_unit_maintain_platform a2 on io.action = a2.sourceAction AND io.fromCorp = a2.unitId
         </if>
@@ -22,6 +25,10 @@
             <if test="id != null and id != ''">
                 AND id = #{id}
             </if>
+            <if test="keyWords != null and keyWords != ''">
+                AND (aw.name like concat('%', #{keyWords}, '%') or bc.name like concat('%', #{keyWords}, '%'))
+            </if>
+
             <if test="corpName != null and corpName != ''">
                 AND (SELECT NAME FROM auth_warehouse aw2 WHERE aw2.CODE = io.fromInvCode) like
                     concat('%', #{corpName}, '%')
@@ -85,7 +92,7 @@
                         or io.outSickInfo like concat('%', #{unionRemark}, '%'))
             </if>
             <if test="statuses != null and statuses.size() != 0">
-                AND status in
+                AND io.status in
                 <foreach collection="statuses" index="index" item="item" open="(" close=")" separator=",">
                     #{item}
                 </foreach>
@@ -103,7 +110,7 @@
                 </foreach>
             </if>
             <if test="status != null">
-                AND status = #{status}
+                AND io.status = #{status}
             </if>
             <if test="orderType != null">
                 AND orderType = #{orderType}
@@ -115,7 +122,7 @@
                     <foreach collection="invoiceActions1" index="index" item="item" open="(" close=")" separator=",">
                         #{item}
                     </foreach>
-                    and status = 10)
+                    and io.status = 10)
                 </if>
 
                 <if test="invoiceActions1 == null and invoiceActions2 != null">
@@ -124,7 +131,7 @@
                     <foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
                         #{item}
                     </foreach>
-                    and status = 7
+                    and io.status = 7
                             )
                 </if>
 
@@ -133,13 +140,13 @@
                     <foreach collection="invoiceActions1" index="index" item="item" open="(" close=")" separator=",">
                         #{item}
                     </foreach>
-                    and status = 10)
+                    and io.status = 10)
                             or (
                             `action` in
                     <foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
                         #{item}
                     </foreach>
-                    and status = 7)
+                    and io.status = 7)
                             )
                 </if>
             </if>