From c1bf5bd8b2a43680c98695369bad46d94c4ca586 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 8 Apr 2025 21:58:39 +0800
Subject: [PATCH] =?UTF-8?q?4/8=20=E4=BC=98=E5=8C=96=E9=80=89=E5=85=A5?=
 =?UTF-8?q?=E5=B7=B2=E5=AE=8C=E6=88=90=E5=8D=95=E6=8D=AE1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 73ee218df..09f6266e5 100644
--- a/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java
+++ b/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java
@@ -183,6 +183,9 @@ public class CollectOrderRequest extends ListPageRequest {
     private String orderStartTime;
     private String orderEndTime;
 
+    private Integer isMatching;
+
+    private Integer inAndOutType;
 
 
 
diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBackupMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBackupMapper.xml
index 8735dd61b..698e996e9 100644
--- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBackupMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBackupMapper.xml
@@ -101,6 +101,12 @@
             <if test="invAlert != null">
                 and icob.invAlert = #{invAlert}
             </if>
+            <if test="isMatching != null">
+                and sys_workplace_document.isMatching = #{isMatching}
+            </if>
+            <if test="inAndOutType != null">
+                and sys_workplace_document.inAndOutType = #{inAndOutType}
+            </if>
             <if test="invAlerts != null and invAlerts.size() > 0">
                 and icob.invAlert in
                 <foreach collection="invAlerts" item="item" index="index" separator="," open="(" close=")">