待签收列表统计

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml

@@ -586,7 +586,7 @@
     </select>
     <select id="selectdriverNubCount" resultType="java.lang.Integer">
         SELECT
-        COALESCE(COUNT(*), 0)
+        COALESCE(COUNT(ldr.id), 0)
         FROM
         logpm_distribution_signfor lds
         JOIN logpm_distribution_delivery_list lddl ON lddl.id = lds.delivery_id AND lddl.is_deleted = 0
@@ -637,13 +637,14 @@
     </select>
     <select id="selectclerkNubCount" resultType="java.lang.Integer">
         SELECT
-        COALESCE(COUNT(*), 0)
+        COALESCE(COUNT(ldr.id), 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
         <where>
-            lds.is_deleted = 0 and lds.signing_status ='1' and ldr.is_deleted = 0 and lddl.is_deleted = 0
+            lds.is_deleted = 0
+            and lds.signing_status ='1'
             <if test="param.mallName != null and param.mallName!=''">
                 and ldr.mall_name like concat('%',#{param.mallName},'%')
             </if>