运营端导出增加字段处理

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

@@ -21,219 +21,244 @@ import java.time.LocalDate;
 //        @Translate(field = "status")
 //})
 public class ManagementLogisticsOrderExcelVo implements Serializable {
+
     /**
-     * 结算周期
+     * 状态
      */
-    @ExcelProperty(value = "结算周期")
-    private String accountsCycleLabel;
+    @ExcelProperty(value = "状态")
+    private String statusLabel;
 
     /**
-     * 发起人
+     * 贸易订单编号
      */
-    @ExcelProperty(value = "发起人")
-    private String appointor;
+    @JsonProperty("tOrderNo")
+    @ExcelProperty(value = "贸易订单编号")
+    private String tOrderNo;
 
     /**
-     * 计费方式
+     * 承运订单号
      */
-    @ExcelProperty(value = "计费方式")
-    private String billingModeLabel;
+    @JsonProperty("lOrderNo")
+    @ExcelProperty(value = "托运订单号")
+    private String lOrderNo;
+
+    /**
+     * 订单来源
+     */
+    @ExcelProperty(value = "订单来源")
+    private String orderSourceLabel;
+
+    /**
+     * 托运单位
+     */
+    @ExcelProperty(value = "托运单位")
+    private String consignCompany;
 
     /**
      * 承运单位
      */
     @ExcelProperty(value = "承运单位")
     private String carrierCompany;
+
     /**
-     * 承运联系人
-     */
-    @ExcelProperty(value = "承运联系人")
-    private String carrierContacts;
-    /**
-     * 承运联系电话
+     * 货物名称
      */
-    @ExcelProperty(value = "承运联系电话")
-    private String carrierPhone;
+    @ExcelProperty(value = "货物名称")
+    private String goodsName;
+
     /**
-     * 分配承运量
+     * 任务总量
      */
-    @ExcelProperty(value = "承运量")
+    @ExcelProperty(value = "任务总量")
     private BigDecimal carryingCapacity;
 
     /**
-     * 托运单位
+     * 待分配量(amount-subcontract_amount-entrust_amount)
      */
-    @ExcelProperty(value = "托运单位")
-    private String consignCompany;
+    @ExcelProperty(value = "待分配量")
+    private String waitDistributionAmount;
+
     /**
-     * 托运联系人
+     * 装货量-实装量
      */
-    @ExcelProperty(value = "托运联系人")
-    private String consignContacts;
+    @ExcelProperty(value = "实装量")
+    private String loadAmount;
+
     /**
-     * 托运联系电话
+     * 卸货量
      */
-    @ExcelProperty(value = "托运联系电话")
-    private String consignPhone;
+    @ExcelProperty(value = "实卸量")
+    private String unloadAmount;
+
     /**
-     * 合同
+     * 运价
      */
-    @ExcelProperty(value = "合同")
-    private String contract;
+    @ExcelProperty(value = "运价")
+    private String priceLabel;
 
     /**
-     * 扣亏货值/元/吨
+     * 税率
      */
-    @ExcelProperty(value = "扣亏货值")
-    private BigDecimal deficitAmount;
+    @ExcelProperty(value = "税率/%")
+    private BigDecimal taxRate;
+
     /**
-     * 货物名称
+     * 装货地点名称
      */
-    @ExcelProperty(value = "货物名称")
-    private String goodsName;
+    @ExcelProperty(value = "装货地点名称")
+    private String loadName;
+
     /**
-     * 装货地点
+     * 地址明细
      */
-    @ExcelProperty(value = "装货地点")
+    @ExcelProperty(value = "地址明细")
     private String loadAddress;
 
     /**
-     * 承运订单号
+     * 卸货地点名称
      */
-    @JsonProperty("lOrderNo")
-    @ExcelProperty(value = "托运订单号")
-    private String lOrderNo;
+    @ExcelProperty(value = "卸货地点名称")
+    private String unloadName;
 
     /**
-     * 贸易订单编号
+     * 地址明细
      */
-    @JsonProperty("tOrderNo")
-    @ExcelProperty(value = "贸易订单编号")
-    private String tOrderNo;
+    @ExcelProperty(value = "地址明细")
+    private String unloadAddress;
 
     /**
-     * 合理损耗单位
+     * 发货单位
      */
-    @ExcelProperty(value = "合理损耗")
-    private String lossUnitLabel;
+    @ExcelProperty(value = "发货单位")
+    private String shipmentsUnit;
 
     /**
-     * 运价
+     * 收货单位
      */
-    @ExcelProperty(value = "运价")
-    private String priceLabel;
+    @ExcelProperty(value = "收货单位")
+    private String receiveGoodsUnit;
 
     /**
-     * 税率
+     * 计费方式
      */
-    @ExcelProperty(value = "税率")
-    private BigDecimal taxRate;
+    @ExcelProperty(value = "计费方式")
+    private String billingModeLabel;
 
+    /**
+     * 合理损耗单位
+     */
+    @ExcelProperty(value = "合理损耗")
+    private String lossUnitLabel;
 
     /**
-     * 订单来源
+     * 扣亏货值/元/吨
      */
-    @ExcelProperty(value = "订单来源")
-    private String orderSourceLabel;
+    @ExcelProperty(value = "扣亏货值/元/吨")
+    private BigDecimal deficitAmount;
 
     /**
-     * 收货联系人
+     * 结算周期
      */
-    @ExcelProperty(value = "收货联系人")
-    private String receiveGoodsContacts;
+    @ExcelProperty(value = "结算周期")
+    private String accountsCycleLabel;
 
     /**
-     * 计划收货时间
+     * 承运联系人
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @ExcelProperty(value = "计划收货时间")
-    private LocalDate receiveGoodsDateTime;
+    @ExcelProperty(value = "承运联系人")
+    private String carrierContacts;
 
     /**
-     * 收货电话
+     * 承运联系电话
      */
-    @ExcelProperty(value = "收货电话")
-    private String receiveGoodsPhone;
+    @ExcelProperty(value = "承运联系电话")
+    private String carrierPhone;
 
     /**
-     * 备注
+     * 托运联系人
      */
-    @ExcelProperty(value = "备注")
-    private String remark;
+    @ExcelProperty(value = "托运联系人")
+    private String consignContacts;
 
     /**
-     * 发货联系人
+     * 托运联系电话
      */
-    @ExcelProperty(value = "发货联系人")
-    private String shipmentsContacts;
+    @ExcelProperty(value = "托运联系电话")
+    private String consignPhone;
 
     /**
-     * 计划发货时间
+     * 装货点联系人
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @ExcelProperty(value = "计划发货时间")
-    private LocalDate shipmentsDateTime;
+    @ExcelProperty(value = "装货点联系人")
+    private String shipmentsContacts;
 
     /**
-     * 发货电话
+     * 联系电话
      */
-    @ExcelProperty(value = "发货电话")
+    @ExcelProperty(value = "联系电话")
     private String shipmentsPhone;
 
     /**
-     * 签约方式
+     * 卸货点联系人
      */
-    @ExcelProperty(value = "签约方式")
-    private String signingLabel;
+    @ExcelProperty(value = "卸货点联系人")
+    private String receiveGoodsContacts;
 
     /**
-     * 状态
+     * 联系电话
      */
-    @ExcelProperty(value = "状态")
-    private String statusLabel;
+    @ExcelProperty(value = "联系电话")
+    private String receiveGoodsPhone;
 
     /**
-     * 卸货地点
+     * 计划开始时间
      */
-    @ExcelProperty(value = "卸货地点")
-    private String unloadAddress;
-
-    @ExcelProperty(value = "创建时间")
-    private String createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ExcelProperty(value = "计划开始时间")
+    private LocalDate shipmentsDateTime;
 
-    @ExcelProperty(value = "修改时间")
-    private String updateTime;
+    /**
+     * 计划结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ExcelProperty(value = "计划结束时间")
+    private LocalDate receiveGoodsDateTime;
 
     /**
-     * 发货单位
+     * 关联合同
      */
-    @ExcelProperty(value = "发货单位")
-    private String shipmentsUnit;
+    @ExcelProperty(value = "关联合同")
+    private String contract;
 
     /**
-     * 收货单位
+     * 创建人
      */
-    @ExcelProperty(value = "收货单位")
-    private String receiveGoodsUnit;
+    @ExcelProperty(value = "创建人")
+    private String appointor;
+
+    @ExcelProperty(value = "创建时间")
+    private String createTime;
 
     /**
-     * 商品价值（扣亏货值）
+     * 备注
      */
-    @ExcelProperty(value = "扣亏货值")
-    private String goodsPriceLabel;
+    @ExcelProperty(value = "备注")
+    private String remark;
 
     /**
-     * 装货量
+     * 签约方式
      */
-    @ExcelProperty(value = "装货量")
-    private String loadAmount;
+    @ExcelProperty(value = "签约方式")
+    private String signingLabel;
 
+    @ExcelProperty(value = "修改时间")
+    private String updateTime;
 
     /**
-     * 待分配量(amount-subcontract_amount-entrust_amount)
+     * 商品价值（扣亏货值）
      */
-    @ExcelProperty(value = "待分配量")
-    private String waitDistributionAmount;
+    @ExcelProperty(value = "扣亏货值")
+    private String goodsPriceLabel;
 
     /**
      * 分包量（给下游承运商分包的量）
@@ -247,178 +272,4 @@ public class ManagementLogisticsOrderExcelVo implements Serializable {
     @ExcelProperty(value = "已委托量")
     private String entrustAmount;
 
-    /**
-     * 卸货量
-     */
-    @ExcelProperty(value = "卸货量")
-    private String unloadAmount;
-
-
-
-//    /**
-//     * 结算周期
-//     */
-//    @ExcelProperty(value = "结算周期")
-//    private String accountsCycle;
-//    /**
-//     * 发起人
-//     */
-//    @ExcelProperty(value = "发起人")
-//    private String appointor;
-//    /**
-//     * 计费方式
-//     */
-//    @ExcelProperty(value = "计费方式")
-//    private String billingMode;
-//    /**
-//     * 承运单位
-//     */
-//    @ExcelProperty(value = "承运单位")
-//    private String carrierCompany;
-//    /**
-//     * 承运联系人
-//     */
-//    @ExcelProperty(value = "承运联系人")
-//    private String carrierContacts;
-//    /**
-//     * 承运订单
-//     */
-//    @ExcelProperty(value = "承运订单")
-//    private String carrierOrder;
-//    /**
-//     * 承运联系电话
-//     */
-//    @ExcelProperty(value = "承运联系电话")
-//    private String carrierPhone;
-//    /**
-//     * 分配承运量
-//     */
-//    @ExcelProperty(value = "分配承运量")
-//    private String carryingCapacity;
-//    /**
-//     * 托运单位
-//     */
-//    @ExcelProperty(value = "托运单位")
-//    private String consignCompany;
-//    /**
-//     * 托运联系人
-//     */
-//    @ExcelProperty(value = "托运联系人")
-//    private String consignContacts;
-//    /**
-//     * 托运联系电话
-//     */
-//    @ExcelProperty(value = "托运联系电话")
-//    private String consignPhone;
-//    /**
-//     * 合同
-//     */
-//    @ExcelProperty(value = "合同")
-//    private String contract;
-//    /**
-//     * 扣亏货值/元/吨
-//     */
-//    @ExcelProperty(value = "扣亏货值/元/吨")
-//    private String deficitAmount;
-//    /**
-//     * 货物名称
-//     */
-//    @ExcelProperty(value = "货物名称")
-//    private String goodsName;
-//    /**
-//     * 装货地点
-//     */
-//    @ExcelProperty(value = "装货地点")
-//    private String loadAddress;
-//    /**
-//     * 数据库id
-//     */
-//    private String lOrderId;
-//    /**
-//     * 托运订单号
-//     */
-//    @ExcelProperty(value = "托运订单号")
-//    private String lOrderNo;
-//    /**
-//     * 合理损耗
-//     */
-//    @ExcelProperty(value = "合理损耗")
-//    private String loss;
-//    /**
-//     * 计划时间
-//     */
-//    @ExcelProperty(value = "计划时间")
-//    private String plannedDateTime;
-//    /**
-//     * 运价
-//     */
-//    @ExcelProperty(value = "运价")
-//    private String price;
-//    /**
-//     * 收货联系人
-//     */
-//    @ExcelProperty(value = "收货联系人")
-//    private String receiveGoodsContacts;
-//    /**
-//     * 计划收货时间
-//     */
-//    @ExcelProperty(value = "计划收货时间")
-//    private String receiveGoodsDateTime;
-//    /**
-//     * 收货电话
-//     */
-//    @ExcelProperty(value = "收货电话")
-//    private String receiveGoodsPhone;
-//    /**
-//     * 备注
-//     */
-//    @ExcelProperty(value = "备注")
-//    private String remark;
-//    /**
-//     * 发货联系人
-//     */
-//    @ExcelProperty(value = "发货联系人")
-//    private String shipmentsContacts;
-//    /**
-//     * 计划发货时间
-//     */
-//    @ExcelProperty(value = "计划发货时间")
-//    private String shipmentsDateTime;
-//    /**
-//     * 发货电话
-//     */
-//    @ExcelProperty(value = "发货电话")
-//    private String shipmentsPhone;
-//    /**
-//     * 签约方式
-//     */
-//    @ExcelProperty(value = "签约方式")
-//    private String signing;
-//    /**
-//     * 状态
-//     */
-//    @ExcelProperty(value = "状态", converter = ExcelConverter.class)
-//    @EasyExcel(type = LogisticsOrderEnum.class, status = NumberConstant.TWO)
-//    private String status;
-//    /**
-//     * 卸货地点
-//     */
-//    @ExcelProperty(value = "卸货地点")
-//    private String unloadAddress;
-//    /**
-//     * 关联承运订单号
-//     */
-//    @ExcelProperty(value = "关联承运订单号")
-//    private String wOrderNo;
-//    /**
-//     * 创建时间
-//     */
-//    @ExcelProperty(value = "创建时间")
-//    private String createTime;
-//    /**
-//     * 修改时间
-//     */
-//    @ExcelProperty(value = "修改时间")
-//    private String updateTime;
-
 }