运营端新增展示装卸货名称

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtWaybillOrderMapper.java

@@ -128,15 +128,15 @@ public interface KwtWaybillOrderMapper extends BaseMapper<KwtWaybillOrder> {
     List<WaybillOrderDriverVo> findOtherWaybillOrderByDriver(Map<String, Object> params);
 
     /**
-     *
+     *易订单id查找相关联车辆信息
      * @param id
      * @return
      */
     List<OrderCarDTO> selectWaybillOrderCarListNotPage(@Param("id") String id);
 
     /**
-     *
-     * @param ids
+     *贸易订单ids查找相关联车辆信息
+     * @param ids   贸易订单ids
      * @return
      */
     List<OrderCarDTO> selectWaybillOrderCarListByTradeOrderId(@Param("ids") List<Long> ids);

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/ManagementLogisticsOrderVO.java

@@ -290,4 +290,14 @@ public class ManagementLogisticsOrderVO /*extends PageRequest*/ {
      * 订单主体企业id
      */
     private  Long entId;
+
+    /**
+     * 装货地点名称
+     */
+    private  String loadName;
+
+    /**
+     * 卸货地点名称
+     */
+    private  String unloadName;
 }

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

@@ -1016,6 +1016,7 @@
         b.phone AS shipmentsPhone,
         b.lat AS loadLat,
         b.lng AS loadLng,
+        c.name AS unloadName,
         c.address_type AS unloadType,
         c.contacts AS receiveGoodsContacts,
         c.phone AS receiveGoodsPhone,