From 269880da6ae7d7839c4dc20d6c36c15571007bfe Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 15 Mar 2024 16:17:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E9=80=81=E5=AF=BC=E5=87=BA=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=95=86=E5=9C=BA=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/distribution/vo/DistributionDeliveryListVO.java   | 6 ++++++
 .../distribution/excel/DistributionDeliveryListExcel.java   | 6 ++++++
 .../distribution/mapper/DistributionDeliveryListMapper.xml  | 6 +++++-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListVO.java
index 4613d086a..2fc82ee9d 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListVO.java
@@ -64,6 +64,12 @@ public class DistributionDeliveryListVO extends DistributionDeliveryListEntity {
 	@ApiModelProperty(value = "客户名称")
 	private String consignee;
 
+	/**
+	 * 客户名称
+	 */
+	@ApiModelProperty(value = "客户名称")
+	private String mallName;
+
 	/**
 	 * 配送日期
 	 */
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java
index e98ffcc23..faeae066e 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java
@@ -68,6 +68,12 @@ public class DistributionDeliveryListExcel implements Serializable {
 	@ColumnWidth(20)
 	@ExcelProperty("客户名称")
 	private String consignee;
+	/**
+	 * 仓库
+	 */
+	@ColumnWidth(35)
+	@ExcelProperty("商场名称")
+	private String mallName;
 	/**
 	 * 配送类型;1-自主配送,2-三方配送
 	 */
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 ee890f0f1..f15039df7 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
@@ -306,6 +306,7 @@
         lddl.task_time AS taskTime,
         ldr.warehouse_id AS warehouseId,
         ldr.consignee AS consignee,
+        ldr.mall_name AS mallName,
         CASE
         lddl.kind
         WHEN 1 THEN
@@ -355,7 +356,7 @@
         WHERE
         lddl.id = lds.delivery_id
         ) signingNumber,
-        GROUP_CONCAT( lddl.loading_team_name, lddl.loading_team_name ) AS handlingCrew
+        GROUP_CONCAT( lddl.loading_team_name, lddl.unloading_team_name ) AS handlingCrew
         FROM
         logpm_distribution_delivery_list AS lddl
         LEFT JOIN logpm_distribution_signfor AS lds ON lddl.id = lds.delivery_id
@@ -376,6 +377,9 @@
            <if test=" params.clineName != '' and params.clineName != null">
                AND ldr.consignee like concat('%',#{params.clineName},'%')
            </if>
+           <if test=" params.mallName != '' and params.mallName != null">
+               AND ldr.mall_name like concat('%',#{params.mallName},'%')
+           </if>
            <if test=" params.type != '' and params.type != null">
                AND lddl.type = #{params.type}
            </if>