配送列表增加商场字段

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;
+
 	/**
 	 * 签收件数
 	 */

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>