From c612696cae7f50cb31d1b0c35588860643f0a0ec Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 17 Sep 2024 23:35:29 +0800
Subject: [PATCH] =?UTF-8?q?9/17=20=E5=AD=97=E6=AE=B5=E6=90=9C=E7=B4=A2?=
=?UTF-8?q?=E4=BC=98=E5=8C=961.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/glxp/api/req/collect/CollectOrderRequest.java | 4 ++++
.../mapper/collect/IoCollectOrderBackupMapper.xml | 9 +++++++++
.../mybatis/mapper/collect/IoCollectOrderMapper.xml | 6 ++++++
.../mapper/collect/IoCollectOrderOriginMapper.xml | 6 ++++++
4 files changed, 25 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 c7c890504..6267e499c 100644
--- a/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java
+++ b/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java
@@ -149,4 +149,8 @@ public class CollectOrderRequest extends ListPageRequest {
private String excludeWorkCode;
+ //发货方
+ private String shipperName;
+
+
}
diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBackupMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBackupMapper.xml
index d549f77ef..499bdb978 100644
--- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBackupMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBackupMapper.xml
@@ -21,6 +21,9 @@
icob.invAlert,
icob.splitMsg,
icob.fromCorpName,
+ icob.shipperName,
+ icob.thrBusType,
+ icob.shipper,
icob.tagMsg,
sys_workplace_document.busName busTypeName,
sw.workplaceName,
@@ -108,6 +111,12 @@
or icob.busType like concat('%', #{keywords}, '%')
or icob.fromType like concat('%', #{keywords}, '%'))
+
+ AND icob.shipperName LIKE concat('%', #{shipperName}, '%')
+
+
+ AND icob.fromCorpName LIKE concat('%', #{fromCorpName}, '%')
+
GROUP BY
icob.billNo
diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
index f88e8faa2..dc00261e8 100644
--- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
@@ -123,6 +123,12 @@
or ico.fromCorpName like concat('%', #{keywords}, '%')
or ico.fromType like concat('%', #{keywords}, '%'))
+
+ AND ico.shipperName LIKE concat('%', #{shipperName}, '%')
+
+
+ AND ico.fromCorpName LIKE concat('%', #{fromCorpName}, '%')
+
GROUP BY
ico.billNo
diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml
index 09d7a112e..077fd603d 100644
--- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml
@@ -96,6 +96,12 @@
AND fromType LIKE concat('%', #{fromType}, '%')
+
+ AND ico.shipperName LIKE concat('%', #{shipperName}, '%')
+
+
+ AND ico.fromCorpName LIKE concat('%', #{fromCorpName}, '%')
+
AND collectCode = #{collectCode}