Procházet zdrojové kódy

1、司机端任务列表返回装卸货地址;

zk před 2 roky
rodič
revize
129d9ee7ea

+ 11 - 11
sckw-modules/sckw-transport/src/main/resources/mapper/KwtWaybillOrderMapper.xml

@@ -369,10 +369,10 @@
                      woa2.city_code      unloadCityCode,
                      woa2.city_name      unloadCityName,
                      woa2.detail_address unloadDetailAddress,
-                     wo.load_amount      loadAmount,
-                     wo.unload_amount    unloadAmount,
-                     wo.deficit_amount   deficitAmount,
-                     wo.deficit_price    deficitPrice,
+                     IFNULL(wo.load_amount, 0.0)      loadAmount,
+                     IFNULL(wo.unload_amount, 0.0)    unloadAmount,
+                     IFNULL(wo.deficit_amount, 0.0)   deficitAmount,
+                     IFNULL(wo.deficit_price, 0.0)    deficitPrice,
                      wo.truck_no         truckNo,
                      wo.status,
                      wo.create_time      createTime
@@ -408,10 +408,10 @@
                      loa2.city_code      unloadCityCode,
                      loa2.city_name      unloadCityName,
                      loa2.detail_address unloadDetailAddress,
-                     null                loadAmount,
-                     null                unloadAmount,
-                     null                deficitAmount,
-                     null                deficitPrice,
+                     0.0                loadAmount,
+                     0.0                unloadAmount,
+                     0.0                deficitAmount,
+                     0.0                deficitPrice,
                      loc.truck_no        truckNo,
                      1                   status,
                      loc.update_time     createTime
@@ -436,9 +436,9 @@
         wo.ent_id carrierEntId, 'xxxxx' carrierFirmName, log.goods_name goodsName, wo.start_time startTime,
         wo.end_time endTime, wo.entrust_amount entrustAmount, woa1.name loadName, woa1.city_code loadCityCode,
         woa1.city_name loadCityName, woa1.detail_address loadDetailAddress, woa2.name unloadName, woa2.city_code
-        unloadCityCode, woa2.city_name unloadCityName, woa2.detail_address unloadDetailAddress, wo.load_amount loadAmount,
-        wo.unload_amount unloadAmount, wo.deficit_amount deficitAmount, wo.deficit_price deficitPrice, wo.truck_no truckNo,
-        wo.status, wo.create_time createTime
+        unloadCityCode, woa2.city_name unloadCityName, woa2.detail_address unloadDetailAddress, IFNULL(wo.load_amount, 0.0) loadAmount,
+        IFNULL(wo.unload_amount, 0.0) unloadAmount, IFNULL(wo.deficit_amount, 0.0) deficitAmount, IFNULL(wo.deficit_price, 0.0) deficitPrice,
+        wo.truck_no truckNo, wo.status, wo.create_time createTime
         FROM kwt_waybill_order wo
         LEFT JOIN kwt_logistics_order lo on lo.id = wo.l_order_id
         LEFT JOIN kwt_waybill_order_address woa1 on woa1.w_order_id = wo.id and woa1.address_type = 1