承运订单vo-dto定义

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

@@ -9,6 +9,121 @@ import lombok.Data;
  */
 @Data
 public class ConsignmentVo {
-    private String a;
+    /**
+     * 状态
+     */
+    private String status;
+    /**
+     * 托运订单号
+     */
+    private String consignmentNumber;
+    /**
+     * 承运单位
+     */
+    private String acceptCarriageCompany;
 
+    /**
+     * 货物名称
+     */
+    private String goodsName;
+    /**
+     * 签约方式
+     */
+    private String signing;
+    /**
+     * 分配承运量
+     */
+    private String carryingCapacity;
+    /**
+     * 装货地点
+     */
+    private String stowageAddress;
+    /**
+     * 卸货地点
+     */
+    private String unloadAddress;
+    /**
+     * 运价
+     */
+    private String freightRate;
+    /**
+     * 计费方式
+     */
+    private String billingMode;
+    /**
+     * 合理损耗
+     */
+    private String wastage;
+    /**
+     * 扣亏货值/元/吨
+     */
+    private String defectiveValue;
+    /**
+     * 结算周期
+     */
+    private String accountsCycle;
+    /**
+     * 承运联系人
+     */
+    private String acceptCarriagePerson;
+    /**
+     * 承运联系电话
+     */
+    private String acceptCarriageTel;
+    /**
+     * 托运单位
+     */
+    private String consignCompany;
+    /**
+     * 托运联系人
+     */
+    private String consignPerson;
+    /**
+     * 托运联系电话
+     */
+    private String consignTel;
+    /**
+     * 发货联系人
+     */
+    private String shipmentsPerson;
+    /**
+     * 发货电话
+     */
+    private String shipmentsTel;
+    /**
+     * 收货联系人
+     */
+    private String receiveGoodsPerson;
+    /**
+     * 收货电话
+     */
+    private String receiveGoodsTel;
+    /**
+     * 计划发货时间
+     */
+    private String shipmentsDate;
+    /**
+     * 计划收货时间
+     */
+    private String ReceiveGoodsDate;
+    /**
+     * 承运订单号
+     */
+    private String consignOrderId;
+    /**
+     * 合同
+     */
+    private String contract;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 发起人
+     */
+    private String planner;
+    /**
+     * 计划时间
+     */
+    private String plannedDate;
 }

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

@@ -13,9 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author lfdc
@@ -40,14 +38,15 @@ public class AcceptCarriageOrderService {
         list.add(acceptCarriageOrderVo);
         PageHelper.startPage(query.getPage(), query.getPageSize());
         PageResult pageResult = PageHelperUtil.getPageResult(new PageInfo<>(list));
-        Map<String,Object> map=new HashMap<>();
-        map.put("data",pageResult);
-        Map<String,Object> map1=new HashMap<>();
-        map1.put("data1","1");
-        map1.put("data12","12");
-        map1.put("data13","13");
-        map.put("statistics",map1);
-        return HttpResult.ok(map);
+        return HttpResult.ok(pageResult);
+//        Map<String,Object> map=new HashMap<>();
+//        map.put("data",pageResult);
+//        Map<String,Object> map1=new HashMap<>();
+//        map1.put("data1","1");
+//        map1.put("data12","12");
+//        map1.put("data13","13");
+//        map.put("statistics",map1);
+//        return HttpResult.ok(map);
     }
 
     public HttpResult count(AcceptCarriageOrderQuery query) {