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 @@
and ldr.consignee like concat('%',#{param.clineName},'%')
+
+ and ldr.mall_name like concat('%',#{param.mallName},'%')
+
and lddl.vehicle_name like concat('%',#{param.vehicleName},'%')