工作台承运订单、托运订单按车次统计处理

sckw-modules/sckw-system/src/main/resources/mapper/SysDictDao.xml

@@ -223,7 +223,7 @@
   </select>
 
   <select id="queryByType" resultType="com.sckw.system.model.SysDict">
-    select * from sys_dict where del_flag = 0 and type = #{type}
+    select * from sys_dict where del_flag = 0 and type = #{type} order by sort
   </select>
 
   <select id="queryUnitDict" resultType="com.sckw.system.model.SysDict">
@@ -233,6 +233,7 @@
        and dict_id = #{dictTypeId}
        and parent_id = #{parentId}
        and (value = #{value} or label = #{label})
+    order by sort
   </select>
 
   <select id="queryByTypeAndValue" resultType="com.sckw.system.model.SysDict">

sckw-modules/sckw-transport/src/main/resources/mapper/KwtLogisticsOrderMapper.xml

@@ -2072,7 +2072,7 @@
         a.entrust_amount AS entrustAmount,
         a.subcontract_amount AS subcontractAmount,
         a.price,
-        a.amount * IFNULL(a.price, 0) AS totalPrice
+        case when a.billing_mode = '3' then IFNULL( a.price, 0 ) else a.amount * IFNULL( a.price, 0 ) end AS totalPrice
         FROM kwt_logistics_order a
         LEFT JOIN kwt_logistics_order_unit b ON a.id = b.l_order_id
         AND a.del_flag = 0
@@ -2115,7 +2115,7 @@
         a.entrust_amount AS entrustAmount,
         a.subcontract_amount AS subcontractAmount,
         a.price,
-        a.amount * IFNULL(a.price, 0) AS totalPrice
+        case when a.billing_mode = '3' then IFNULL( a.price, 0 ) else a.amount * IFNULL( a.price, 0 ) end AS totalPrice
         FROM kwt_logistics_order a
         LEFT JOIN kwt_logistics_order_unit b ON a.id = b.l_order_id
         AND a.del_flag = 0
@@ -2152,7 +2152,7 @@
                a.entrust_amount                                     AS entrustAmount,
                a.subcontract_amount                                 AS subcontractAmount,
                a.price,
-               a.amount * IFNULL(a.price, 0)                        AS totalPrice
+               case when a.billing_mode = '3' then IFNULL( a.price, 0 ) else a.amount * IFNULL( a.price, 0 ) end AS totalPrice
         FROM kwt_logistics_order a
                  LEFT JOIN kwt_logistics_order_unit b ON a.id = b.l_order_id
             AND a.del_flag = 0