From 08b714b43b90808422eed742e7161cd263f14dd9 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Thu, 15 Aug 2024 20:08:02 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8D=95=E6=8D=AEin=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/collect/CollectOrderRequest.java  | 4 ++++
 .../mybatis/mapper/collect/IoCollectOrderMapper.xml         | 6 ++++++
 2 files changed, 10 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 c869a81a5..b8f3284bd 100644
--- a/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java
+++ b/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java
@@ -84,5 +84,9 @@ public class CollectOrderRequest extends ListPageRequest {
 
     private List<Integer> tagStatusList;
 
+    private Integer tagStatus;
+
+    private String workplaceName;
+
 
 }
diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
index 14df0f328..839a7a266 100644
--- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
@@ -16,6 +16,9 @@
             <if test="billNo != '' and billNo != null">
                 AND billNo LIKE concat('%', #{billNo}, '%')
             </if>
+            <if test="workplaceName != '' and workplaceName != null">
+                AND workplaceName LIKE concat('%', #{workplaceName}, '%')
+            </if>
             <if test="busType != null and busType != ''">
                 AND busType = #{busType}
             </if>
@@ -31,6 +34,9 @@
             <if test="busType != null and busType != ''">
                 AND busType = #{busType}
             </if>
+            <if test="tagStatus != null">
+                AND tagStatus = #{tagStatus}
+            </if>
             <if test="workPlaceCode != null and workPlaceCode != ''">
                 AND workPlaceCode = #{workPlaceCode}
             </if>