demand: 运单补打印报错问题定位解决

committer: heyu

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