From d6e670ed0f0fbd8e4084c8e4df5b5a22f555dc08 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Sat, 14 Sep 2024 16:03:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=8D=95=E6=8D=AE=E5=8C=BA?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/req/collect/CollectOrderRequest.java  | 6 ++++--
 .../mybatis/mapper/collect/IoCollectOrderMapper.xml         | 5 +++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java b/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java
index a0ec9242d..c7c890504 100644
--- a/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java
+++ b/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java
@@ -120,12 +120,12 @@ public class CollectOrderRequest extends ListPageRequest {
     private List<Integer> invAlerts;
 
     /**
-     *上传状态(1.未上传,2.已上传,3.上传失败)
+     * 上传状态(1.未上传,2.已上传,3.上传失败)
      */
     private Integer uploadStatus;
 
     /**
-     *上传错误信息
+     * 上传错误信息
      */
     private String updateError;
 
@@ -147,4 +147,6 @@ public class CollectOrderRequest extends ListPageRequest {
      */
     private String keywords;
 
+    private String excludeWorkCode;
+
 }
diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
index 24f676a16..3f8d7fb29 100644
--- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
@@ -62,6 +62,11 @@
             <if test="workPlaceCode != null">
                 AND ico.workPlaceCode = #{workPlaceCode}
             </if>
+
+            <if test="excludeWorkCode != null and excludeWorkCode != ''">
+                AND ico.workPlaceCode!=null and ico.workPlaceCode not in (#{excludeWorkCode})
+            </if>
+
             <if test="chargeUser != null">
                 AND sw.chargeUser = #{chargeUser}
             </if>