From f8ff8c7f377a2ffd1d13e90bf1ffcce9e156542d Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 29 Nov 2024 16:10:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E7=AD=BE=E6=94=B6=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/mapper/DistributionSignforMapper.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index 48de7bc66..3b8d96ec0 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -589,11 +589,12 @@ COALESCE(COUNT(*), 0) FROM logpm_distribution_signfor lds - JOIN logpm_distribution_delivery_list lddl ON lddl.id = lds.delivery_id - JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id + JOIN logpm_distribution_delivery_list lddl ON lddl.id = lds.delivery_id AND lddl.is_deleted = 0 + JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id AND ldr.is_deleted = 0 AND ldr.reservation_status != 40 - lds.is_deleted = 0 and lds.driver_signing ='1' and ldr.is_deleted = 0 and lddl.is_deleted = 0 AND - lds.signing_status = '1' + lds.is_deleted = 0 + and lds.driver_signing ='1' + AND lds.signing_status = '1' and ldr.mall_name like concat('%',#{param.mallName},'%')