From 136821eeb3337d4124d5fbd6b7c6b37b3077257e Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 15 Mar 2024 15:55:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E9=80=81=E5=88=97=E8=A1=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=95=86=E5=9C=BA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/DistributionDeliveryListEntity.java             | 7 +++++++
 .../distribution/mapper/DistributionDeliveryListMapper.xml | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java
index 077c440e0..46c78495b 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java
@@ -269,6 +269,13 @@ public class DistributionDeliveryListEntity extends TenantEntity {
 	@TableField(exist = false)
 	private String clineName;
 
+	/**
+	 * 商场名称
+	 */
+	@ApiModelProperty(value = "商场名称")
+	@TableField(exist = false)
+	private String mallName;
+
 	/**
 	 * 签收件数
 	 */
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
index a36cd515d..ee890f0f1 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
@@ -205,7 +205,8 @@
         WHERE
         lddl.id = lds.delivery_id
         ) signingNumber,
-        GROUP_CONCAT(DISTINCT ldr.consignee SEPARATOR ',') clineName
+        GROUP_CONCAT(DISTINCT ldr.consignee SEPARATOR ',') clineName,
+        GROUP_CONCAT(DISTINCT ldr.mall_name SEPARATOR ',') mallName
         FROM  logpm_distribution_delivery_list lddl
         left JOIN logpm_distribution_signfor lds on lddl.id = lds.delivery_id
         LEFT JOIN logpm_distribution_reservation ldr on ldr.id = lds.reservation_id
@@ -226,6 +227,9 @@
             <if test="param.clineName != null and param.clineName!=''">
                 and ldr.consignee like concat('%',#{param.clineName},'%')
             </if>
+            <if test="param.mallName != null and param.mallName!=''">
+                and ldr.mall_name like concat('%',#{param.mallName},'%')
+            </if>
             <if test="param.vehicleName != null and param.vehicleName!=''">
                 and lddl.vehicle_name like concat('%',#{param.vehicleName},'%')
             </if>