From 186ccd438adced6822ff867529ba2c557bb8981f Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 14 Nov 2024 18:03:49 +0800
Subject: [PATCH] =?UTF-8?q?11/14=20=E6=A7=BD=E4=BD=8D=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../req/basic/SysWorkplaceQueueRequest.java   |  6 ++++
 .../mapper/basic/SysWorkplaceQueueMapper.xml  | 29 ++++++++++++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/req/basic/SysWorkplaceQueueRequest.java b/src/main/java/com/glxp/api/req/basic/SysWorkplaceQueueRequest.java
index acdb440ec..136887635 100644
--- a/src/main/java/com/glxp/api/req/basic/SysWorkplaceQueueRequest.java
+++ b/src/main/java/com/glxp/api/req/basic/SysWorkplaceQueueRequest.java
@@ -43,6 +43,12 @@ public class SysWorkplaceQueueRequest extends ListPageRequest {
 
     private String relId;
 
+    private String keyWords;
+
+    private String ggxh;
+
+    private String cpmctymc;
+
 
 
 
diff --git a/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml b/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml
index 9e52beb4c..82fff607a 100644
--- a/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml
+++ b/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml
@@ -57,8 +57,26 @@
                 bp.nameCode like concat('%', #{nameCode}, '%')
                 )
             </if>
+            <if test="cpmctymc != null and cpmctymc != ''">
+                AND (
+                bp.cpmctymc like concat('%', #{cpmctymc}, '%')
+                )
+            </if>
+            <if test="ggxh != null and ggxh != ''">
+                AND (
+                bp.ggxh like concat('%', #{ggxh}, '%')
+                or bp.bzgg like concat('%', #{ggxh}, '%')
+                )
+            </if>
             <if test=" layerCode != null and layerCode != ''">
-                AND layerCode = #{layerCode}
+                AND (
+                layerCode like concat('%', #{layerCode}, '%')
+                )
+            </if>
+            <if test=" freightCode != null and freightCode != ''">
+                AND (
+                freightCode like concat('%', #{freightCode}, '%')
+                )
             </if>
             <if test=" code != null and code != ''">
                 AND swq.code = #{code}
@@ -72,6 +90,15 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="keyWords != null and keyWords != '' ">
+                AND (
+                bp.nameCode like concat('%', #{keyWords}, '%')
+                or bp.cpmctymc like concat('%', #{keyWords}, '%')
+                or bp.ggxh like concat('%', #{keyWords}, '%')
+                or bp.bzgg like concat('%', #{keyWords}, '%')
+                or layerCode like concat('%', #{keyWords}, '%')
+                or freightCode like concat('%', #{keyWords}, '%'))
+            </if>
         </where>
         GROUP BY swq.code
     </select>