From 41af26692786685ea02118c86bbe70e7bab77d20 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 15 Aug 2024 16:50:04 +0800
Subject: [PATCH] md

---
 .../xdadan/erp/emis/utils/Kd100Helper.java    |  5 --
 .../resources/mapper/EmisWaybillMapper.xml    | 55 +++++++++++--------
 2 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java
index db2d90c23..190d3c6eb 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java
@@ -169,11 +169,6 @@ public class Kd100Helper {
     }
 
 
-
-
-
-
-
         /**
          * 业务数据加密  -->   param + key + customer 的顺序进行MD5加密（注意加密后字符串一定要转大写）
          * @param timestamp
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 27def10fb..6704e9eee 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -470,22 +470,22 @@
         <include refid="selectEmisWaybillVo"/>
         where FIND_IN_SET(`bill_code`,#{billCode})
 
-        ORDER BY
+
         <if test="params.orderSnSortList != null and params.orderSnSortList.size >0  ">
-            FIELD
+            ORDER BY  FIELD
             <foreach collection="params.orderSnSortList" item="item" open="(order_sn," separator="," close=")">
                 #{item}
             </foreach>
-            ,
         </if>
         <if test="params.billCodeSortList != null and params.billCodeSortList.size >0  ">
-            FIELD
+            ORDER BY FIELD
             <foreach collection="params.billCodeSortList" item="item" open="(bill_code," separator="," close=")">
                 #{item}
             </foreach>
-            ,
         </if>
-        a.create_time desc
+        <if test="params.billCodeSortList == null">
+            ORDER BY  a.send_date desc
+        </if>
     </select>
 
     <select id="selectOrderList" parameterType="EmisWaybill" resultMap="EmisWaybillResult">
@@ -790,22 +790,23 @@
         </where>
 
 
-        ORDER BY
+
         <if test="params.orderSnSortList != null and params.orderSnSortList.size >0  ">
-            FIELD
+            ORDER BY FIELD
             <foreach collection="params.orderSnSortList" item="item" open="(order_sn," separator="," close=")">
                 #{item}
             </foreach>
-            ,
         </if>
         <if test="params.billCodeSortList != null and params.billCodeSortList.size >0  ">
-            FIELD
+            ORDER BY FIELD
             <foreach collection="params.billCodeSortList" item="item" open="(bill_code," separator="," close=")">
                 #{item}
             </foreach>
-            ,
         </if>
-        a.create_time desc
+
+        <if test="params.billCodeSortList == null ">
+            ORDER BY  a.send_date desc
+        </if>
     </select>
 
     <select id="selectEmisWaybillList" parameterType="EmisWaybill" resultMap="EmisWaybillResult">
@@ -1106,22 +1107,26 @@
         </where>
 
 
-        ORDER BY
         <if test="params.orderSnSortList != null and params.orderSnSortList.size >0  ">
-             FIELD
+            ORDER BY  FIELD
             <foreach collection="params.orderSnSortList" item="item" open="(order_sn," separator="," close=")">
                 #{item}
             </foreach>
-            ,
+
         </if>
         <if test="params.billCodeSortList != null and params.billCodeSortList.size >0  ">
-            FIELD
+            ORDER BY  FIELD
             <foreach collection="params.billCodeSortList" item="item" open="(bill_code," separator="," close=")">
                 #{item}
             </foreach>
-            ,
+
         </if>
-        a.create_time desc
+
+        <if test="params.billCodeSortList == null  ">
+            ORDER BY  a.send_date desc
+        </if>
+
+        --         a.create_time desc
     </select>
 
     <!--    寄件网点寄件统计-->
@@ -1619,22 +1624,24 @@
         </where>
 
 
-        ORDER BY
         <if test="params.orderSnSortList != null and params.orderSnSortList.size >0  ">
-            FIELD
+            ORDER BY FIELD
             <foreach collection="params.orderSnSortList" item="item" open="(order_sn," separator="," close=")">
                 #{item}
             </foreach>
-            ,
         </if>
         <if test="params.billCodeSortList != null and params.billCodeSortList.size >0  ">
-            FIELD
+            ORDER BY FIELD
             <foreach collection="params.billCodeSortList" item="item" open="(bill_code," separator="," close=")">
                 #{item}
             </foreach>
-            ,
         </if>
-        a.create_time desc
+
+        <if test="params.billCodeSortList == null  ">
+            ORDER BY a.send_date desc
+        </if>
+
+
     </select>
 
     <!--    where take_piece_employee_code is not null-->