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

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/WaybillManagementService.java

@@ -97,7 +97,8 @@ public class WaybillManagementService {
         }
         WaybillDataVO waybillDataVO = new WaybillDataVO();
         Criteria criteria = new Criteria();
-        criteria.and("wOrderId").is(id);
+        //criteria.and("wOrderId").is(id);
+        criteria.and("_id").is(id);
         criteria.and("entId").is(LoginUserHolder.getEntId());
         criteria.and("delFlag").is(NumberConstant.ZERO);
         Query queryFormat = new Query(criteria);

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

@@ -400,14 +400,14 @@
                      loc.start_time      startTime,
                      loc.end_time        endTime,
                      loc.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,
+                     loa1.name           loadName,
+                     loa1.city_code      loadCityCode,
+                     loa1.city_name      loadCityName,
+                     loa1.detail_address loadDetailAddress,
+                     loa2.name           unloadName,
+                     loa2.city_code      unloadCityCode,
+                     loa2.city_name      unloadCityName,
+                     loa2.detail_address unloadDetailAddress,
                      null                loadAmount,
                      null                unloadAmount,
                      null                deficitAmount,
@@ -416,10 +416,10 @@
                      1                   status,
                      loc.update_time     createTime
               FROM kwt_logistics_order_circulate loc
-                       LEFT JOIN kwt_logistics_order lo on lo.id = loc.l_order_id
-                       LEFT JOIN kwt_waybill_order_address woa1 on woa1.w_order_id = lo.id and woa1.address_type = 1
-                       LEFT JOIN kwt_waybill_order_address woa2 on woa2.w_order_id = lo.id and woa2.address_type = 2
-                       LEFT JOIN kwt_logistics_order_goods log on log.l_order_id = loc.l_order_id
+                LEFT JOIN kwt_logistics_order lo on lo.id = loc.l_order_id
+                LEFT JOIN kwt_logistics_order_address loa1 on loa1.l_order_id = lo.id and loa1.address_type = 1
+                LEFT JOIN kwt_logistics_order_address loa2 on loa2.l_order_id = lo.id and loa2.address_type = 2
+                LEFT JOIN kwt_logistics_order_goods log on log.l_order_id = loc.l_order_id
               where loc.del_flag = 0
                 and lo.del_flag = 0
                 and loc.status = 0