From 01ab76f1a5236a4f478cf6520dc58d415a1f6545 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 20 Jan 2025 18:26:05 +0800
Subject: [PATCH] md

---
 .../resources/mapper/EmisWaybillMapper.xml    | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index c28f222a9..33242d630 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -889,14 +889,14 @@
             <if test="updateSite != null  and updateSite != ''"> and a.update_site=#{updateSite}</if>
 
             <if test="params.problemQueryType != null and params.problemQueryType == 1 and params.problemQueryIds != null and params.problemQueryIds !=''">
-                and a.bill_code in (
-                    select bill_code from emis_waybill_problem_info ewpi where ewpi.del_flag='0' and ewpi.`problem_type` is not null and  FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} )
+                and exists (
+                select 1 from emis_waybill_problem_info ewpi where  a.bill_code=ewpi.bill_code and ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} )
                 )
             </if>
 
             <if test="params.problemQueryType != null and params.problemQueryType == 2 and params.problemQueryIds != null and params.problemQueryIds !=''">
-                and a.bill_code not in (
-                    select bill_code from emis_waybill_problem_info ewpi where  ewpi.del_flag='0' and  FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} )
+                and  not exists (
+                select 1 from emis_waybill_problem_info ewpi where a.bill_code=ewpi.bill_code and  ewpi.del_flag='0' and  FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} )
                 )
             </if>
 
@@ -1190,14 +1190,14 @@
 
 
             <if test="params.problemQueryType != null and params.problemQueryType == 1 and params.problemQueryIds != null and params.problemQueryIds !=''">
-                and a.bill_code in (
-                    select bill_code from emis_waybill_problem_info ewpi where  ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} )
+                and exists (
+                select 1 from emis_waybill_problem_info ewpi where  a.bill_code=ewpi.bill_code and ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} )
                 )
             </if>
 
             <if test="params.problemQueryType != null and params.problemQueryType == 2 and params.problemQueryIds != null and params.problemQueryIds !=''">
-                and a.bill_code not in (
-                    select bill_code from emis_waybill_problem_info ewpi where  ewpi.del_flag='0' and  FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} )
+                and  not exists (
+                select 1 from emis_waybill_problem_info ewpi where a.bill_code=ewpi.bill_code and  ewpi.del_flag='0' and  FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} )
                 )
             </if>
 
@@ -1563,12 +1563,12 @@
     <select id="getQueryStatInfoMap" parameterType="EmisWaybill" resultType="map">
         select
         count(1) as totalNum,
-        sum(a.parcel_qty) as totalParcelQty,
-        round(sum(bill_weight),2) as totalBillWeight,
-        round(sum(total_volume),5) as totalVolume,
-        round(sum(volume_weight),2) as totalVolumeWeight,
-        round(sum(settlement_weight),2) as totalSettlementWeight,
-        round(sum(freight),2) as totalFreight
+        ifnull(sum(a.parcel_qty),0) as totalParcelQty,
+        ifnull(round(sum(bill_weight),2),0) as totalBillWeight,
+        ifnull(round(sum(total_volume),5),0) as totalVolume,
+        ifnull(round(sum(volume_weight),2),0) as totalVolumeWeight,
+        ifnull(round(sum(settlement_weight),2),0) as totalSettlementWeight,
+        ifnull(round(sum(freight),2),0) as totalFreight
         from emis_waybill a
         <where>
             a.del_flag='0' and a.order_status !='0' and a.order_status!='2'
@@ -1733,14 +1733,14 @@
             <if test="updateSite != null  and updateSite != ''"> and a.update_site=#{updateSite}</if>
 
             <if test="params.problemQueryType != null and params.problemQueryType == 1 and params.problemQueryIds != null and params.problemQueryIds !=''">
-                and a.bill_code in (
-                    select bill_code from emis_waybill_problem_info ewpi where  ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} )
+                and exists (
+                    select 1 from emis_waybill_problem_info ewpi where  a.bill_code=ewpi.bill_code and ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} )
                 )
             </if>
 
             <if test="params.problemQueryType != null and params.problemQueryType == 2 and params.problemQueryIds != null and params.problemQueryIds !=''">
-                and a.bill_code not in (
-                select bill_code from emis_waybill_problem_info ewpi where  ewpi.del_flag='0' and  FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} )
+                and  not exists (
+                 select 1 from emis_waybill_problem_info ewpi where a.bill_code=ewpi.bill_code and  ewpi.del_flag='0' and  FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} )
                 )
             </if>