From 9b769e9b386d94aed8ed687884039da8cb76d274 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 30 Sep 2024 16:48:30 +0800
Subject: [PATCH] md

---
 .../src/main/resources/mapper/EmisWaybillMapper.xml    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 3b1946664..2c34fbbb7 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -1180,9 +1180,6 @@
             <if test="updateSite != null  and updateSite != ''"> and a.update_site=#{updateSite}</if>
 
 
-            <if test="params.waybillStatType != null and params.waybillStatType == 1">
-                and a.waybill_status='0' and a.order_status='0'
-            </if>
 
             <if test="params.problemQueryType != null and params.problemQueryType == 1 and params.problemQueryIds != null and params.problemQueryIds !=''">
                 and a.bill_code in (
@@ -1197,12 +1194,17 @@
             </if>
 
 
+            <if test="params.waybillStatType != null and params.waybillStatType == 1">
+                and a.waybill_status='0' and a.order_status='0'
+            </if>
+
+
             <if test="params.waybillStatType != null and params.waybillStatType == 2">
                 and a.waybill_status!='0' and a.order_status!='2'
             </if>
 
             <if test="params.waybillStatType != null and params.waybillStatType == 3">
-                and a.waybill_status!='0' and a.order_status='2'
+                 and a.order_status='2'
             </if>
 
             <if test="params.waybillStatType != null and params.waybillStatType == 4">