From ae6df8ebf4d1b8bb01182659a0307dfd391a45e1 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Sun, 4 Jan 2026 18:04:53 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=20=E8=BF=90=E5=8D=95=E8=A1=A5?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=E5=AE=9A?=
 =?UTF-8?q?=E4=BD=8D=E8=A7=A3=E5=86=B3=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 223cf0bd3..3d8df9647 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xdadan.erp.emis.mapper.EmisWaybillMapper">
 
-    <resultMap type="EmisWaybill" id="BaseEmisWaybillResult" >
+    <resultMap type="EmisWaybill" id="BaseEmisWaybillResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="orderSn"    column="order_sn"    />
         <result property="custOrderId"    column="cust_order_id"    />
@@ -4811,6 +4811,10 @@
                     )
                 )
             </if>
+            <!-- 客户状态 -->
+            <if test="params.status != null and params.status != ''">
+                AND cu.status = #{params.status}
+            </if>
         </where>
         GROUP BY cu.monthly_pay_code, cu.customer_name
         ORDER BY totalWeight DESC, totalTickets DESC, customerName ASC
@@ -4920,6 +4924,10 @@
                     )
                 )
             </if>
+            <!-- 客户状态 -->
+            <if test="params.status != null and params.status != ''">
+                AND cu.status = #{params.status}
+            </if>
         </where>
         GROUP BY cu.monthly_pay_code
         ORDER BY totalWeight desc,totalTickets desc
@@ -5136,6 +5144,10 @@
                 )
                 )
             </if>
+            <!-- 客户状态 -->
+            <if test="params.status != null and params.status != ''">
+                AND mu.status = #{params.status}
+            </if>
         </where>
             GROUP BY mu.id, mu.company
             ORDER BY totalWeight DESC, totalTickets DESC, company ASC
@@ -5245,6 +5257,10 @@
                 )
                 )
             </if>
+            <!-- 客户状态 -->
+            <if test="params.status != null and params.status != ''">
+                AND mu.status = #{params.status}
+            </if>
         </where>
             GROUP BY mu.id, mu.company
             ORDER BY totalWeight DESC, totalTickets DESC, company ASC