商品、订单导出调整

sckw-modules/sckw-order/src/main/java/com/sckw/order/dao/KwpTransportDemandMapper.java

@@ -1,7 +1,7 @@
 package com.sckw.order.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.order.model.KwpTransportDemand;
+import com.sckw.order.model.KwoTransportDemand;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -10,5 +10,5 @@ import org.apache.ibatis.annotations.Mapper;
  * @date: 2023-06-25 14:45
  */
 @Mapper
-public interface KwpTransportDemandMapper extends BaseMapper<KwpTransportDemand> {
+public interface KwpTransportDemandMapper extends BaseMapper<KwoTransportDemand> {
 }

sckw-modules/sckw-order/src/main/java/com/sckw/order/dao/KwpWantBuyAddressMapper.java

@@ -0,0 +1,15 @@
+package com.sckw.order.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.order.model.KwoWantBuyAddress;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @desc: 求购收货地址mapper
+ * @author: yzc
+ * @date: 2023-06-25 14:45
+ */
+@Mapper
+public interface KwpWantBuyAddressMapper extends BaseMapper<KwoWantBuyAddress> {
+
+}

sckw-modules/sckw-order/src/main/java/com/sckw/order/dao/KwpWantBuyMapper.java

@@ -1,7 +1,7 @@
 package com.sckw.order.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.order.model.KwpWantBuy;
+import com.sckw.order.model.KwoWantBuy;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -10,6 +10,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @date: 2023-06-25 14:45
  */
 @Mapper
-public interface KwpWantBuyMapper extends BaseMapper<KwpWantBuy> {
+public interface KwpWantBuyMapper extends BaseMapper<KwoWantBuy> {
 
 }

sckw-modules/sckw-order/src/main/java/com/sckw/order/dao/KwpWantBuyTradingMapper.java

@@ -0,0 +1,15 @@
+package com.sckw.order.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.order.model.KwoWantBuyTrading;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @desc: 求购支付方式mapper
+ * @author: yzc
+ * @date: 2023-06-25 14:45
+ */
+@Mapper
+public interface KwpWantBuyTradingMapper extends BaseMapper<KwoWantBuyTrading> {
+
+}

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrder.java

@@ -7,6 +7,8 @@ import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 
@@ -20,7 +22,10 @@ import java.time.LocalDate;
 @ToString
 @Accessors(chain = true)
 @TableName("kwo_trade_order")
-public class KwoTradeOrder extends BaseModel {
+public class KwoTradeOrder extends BaseModel implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = -4156986025493740589L;
 
     private Long entId;
 

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrderAddress.java

@@ -7,6 +7,9 @@ import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
+
 /**
  * @desc: 交易订单装卸货地址信息
  * @author: yzc
@@ -17,7 +20,10 @@ import lombok.experimental.Accessors;
 @ToString
 @Accessors(chain = true)
 @TableName("kwo_trade_order_address")
-public class KwoTradeOrderAddress extends BaseModel {
+public class KwoTradeOrderAddress extends BaseModel implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = -8603636665614208263L;
 
     /**
      * 交易订单id

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrderContract.java

@@ -7,6 +7,9 @@ import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
+
 /**
  * @desc: 交易订单合同（采购合同/销售合同）
  * @author: yzc
@@ -17,8 +20,10 @@ import lombok.experimental.Accessors;
 @ToString
 @Accessors(chain = true)
 @TableName("kwo_trade_order_contract")
-public class KwoTradeOrderContract extends BaseModel {
+public class KwoTradeOrderContract extends BaseModel implements Serializable {
 
+    @Serial
+    private static final long serialVersionUID = -3482504164031633290L;
     /**
      * 合同id
      */

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrderGoods.java

@@ -7,6 +7,8 @@ import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
 import java.math.BigDecimal;
 
 /**
@@ -19,8 +21,10 @@ import java.math.BigDecimal;
 @ToString
 @Accessors(chain = true)
 @TableName("kwo_trade_order_goods")
-public class KwoTradeOrderGoods extends BaseModel {
+public class KwoTradeOrderGoods extends BaseModel implements Serializable {
 
+    @Serial
+    private static final long serialVersionUID = -4889876395927682008L;
     /**
      * 交易订单id
      */

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrderTrack.java

@@ -7,6 +7,9 @@ import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
+
 /**
  * @desc: 交易订单状态记录信息
  * @author: yzc
@@ -17,8 +20,10 @@ import lombok.experimental.Accessors;
 @ToString
 @Accessors(chain = true)
 @TableName("kwo_trade_order_track")
-public class KwoTradeOrderTrack extends BaseModel {
+public class KwoTradeOrderTrack extends BaseModel implements Serializable {
 
+    @Serial
+    private static final long serialVersionUID = -6808166849168284019L;
     /**
      * 交易订单id
      */

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrderUnit.java

@@ -7,6 +7,9 @@ import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
+
 /**
  * @desc: 交易订单采购/销售企业信息
  * @author: yzc
@@ -17,8 +20,10 @@ import lombok.experimental.Accessors;
 @ToString
 @Accessors(chain = true)
 @TableName("kwo_trade_order_unit")
-public class KwoTradeOrderUnit extends BaseModel {
+public class KwoTradeOrderUnit extends BaseModel implements Serializable {
 
+    @Serial
+    private static final long serialVersionUID = 5594999834090510304L;
     /**
      * 交易订单id
      */

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwpTransportDemand.java → sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTransportDemand.java

@@ -7,6 +7,8 @@ import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
 import java.math.BigDecimal;
 
 /**
@@ -18,8 +20,11 @@ import java.math.BigDecimal;
 @Setter
 @ToString
 @Accessors(chain = true)
-@TableName("kwp_transport_demand")
-public class KwpTransportDemand extends BaseModel {
+@TableName("kwo_transport_demand")
+public class KwoTransportDemand extends BaseModel implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = -20316838934950876L;
 
     /**
      * 企业id

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwpWantBuy.java → sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoWantBuy.java

@@ -7,6 +7,8 @@ import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
 import java.math.BigDecimal;
 
 /**
@@ -18,9 +20,11 @@ import java.math.BigDecimal;
 @Setter
 @ToString
 @Accessors(chain = true)
-@TableName("kwp_want_buy")
-public class KwpWantBuy extends BaseModel {
+@TableName("kwo_want_buy")
+public class KwoWantBuy extends BaseModel implements Serializable {
 
+    @Serial
+    private static final long serialVersionUID = -6542926857955860014L;
     /**
      * 企业id
      */
@@ -39,18 +43,13 @@ public class KwpWantBuy extends BaseModel {
     /**
      * 尺寸大小
      */
-    private String size;
+    private String spec;
 
     /**
      * 单位（吨、方、件、箱、其他）
      */
     private String unit;
 
-    /**
-     * 交易方式(预付款、货到付款、线下付款）
-     */
-    private String trading;
-
     /**
      * 求购单价（元）
      */
@@ -59,5 +58,15 @@ public class KwpWantBuy extends BaseModel {
     /**
      * 求购总量
      */
-    private BigDecimal totalNum;
+    private BigDecimal amount;
+
+    /**
+     * 联系人姓名
+     */
+    private String contacts;
+
+    /**
+     * 联系电话
+     */
+    private String phone;
 }

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoWantBuyAddress.java

@@ -0,0 +1,83 @@
+package com.sckw.order.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.sckw.core.model.base.BaseModel;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * @desc: 求购收货地址信息
+ * @author: yzc
+ * @date: 2023-06-25 9:31
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+@TableName("kwo_want_buy_address")
+public class KwoWantBuyAddress extends BaseModel implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = -4800311939560885399L;
+
+    /**
+     * 求购id
+     */
+    private Long wantBuyId;
+
+    /**
+     * 地址名称
+     */
+    private String name;
+
+    /**
+     * 地址类型
+     */
+    private String type;
+
+    /**
+     * 联系人姓名
+     */
+    private String contacts;
+
+    /**
+     * 联系电话
+     */
+    private String phone;
+
+    /**
+     * 所在地区
+     */
+    private Integer cityCode;
+
+    /**
+     * 所属区域名称
+     */
+    private String cityName;
+
+    /**
+     * 详细地址
+     */
+    private String detailAddress;
+
+    /**
+     * 纬度
+     */
+    private String lat;
+
+    /**
+     * 经度
+     */
+    private String lng;
+
+    /**
+     * 电子围栏
+     */
+    private String fence;
+
+}

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoWantBuyTrading.java

@@ -0,0 +1,38 @@
+package com.sckw.order.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.sckw.core.model.base.BaseModel;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * @desc: 求购支付方式信息
+ * @author: yzc
+ * @date: 2023-06-25 9:31
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+@TableName("kwo_want_buy_trading")
+public class KwoWantBuyTrading extends BaseModel implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = -7895014107811238535L;
+    /**
+     * 求购id
+     */
+    private Long wantBuyId;
+
+    /**
+     * 支付方式
+     */
+    private String trading;
+
+
+}

sckw-modules/sckw-product/src/main/java/com/sckw/product/controller/KwpGoodsController.java

@@ -1,8 +1,8 @@
 package com.sckw.product.controller;
 
+import com.sckw.core.exception.BusinessException;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.web.response.HttpResult;
-import com.sckw.excel.easyexcel.RequestHolder;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.product.model.GoodsListExport;
 import com.sckw.product.model.vo.req.*;
@@ -62,7 +62,7 @@ public class KwpGoodsController {
      */
     @GetMapping("/detail")
     public HttpResult detail(@RequestParam Long id) {
-        return HttpResult.ok(kwpGoodsService.detail(id,false));
+        return HttpResult.ok(kwpGoodsService.detail(id, false));
     }
 
     /**
@@ -111,14 +111,12 @@ public class KwpGoodsController {
      * @return: com.sckw.core.web.response.HttpResult
      */
     @PostMapping(value = "/export", produces = MediaType.APPLICATION_JSON_VALUE)
-    public HttpResult export(@RequestBody ExportGoodsListParam params) {
-        HttpServletResponse response = RequestHolder.getResponse();
+    public void export(@RequestBody ExportGoodsListParam params, HttpServletResponse response) {
         List<GoodsListExport> list = kwpGoodsService.export(params);
-        if (CollectionUtils.isNotEmpty(list)) {
-            ExcelUtil.download(response, GoodsListExport.class, list);
-            return HttpResult.ok();
+        if (CollectionUtils.isEmpty(list)) {
+            throw new BusinessException("导出数据为空！");
         }
-        return HttpResult.error("没有可导出的数据");
+        ExcelUtil.downData(response, GoodsListExport.class, list);
     }
 
 

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/GoodsListExport.java

@@ -5,6 +5,7 @@ import com.sckw.excel.annotation.ExcelContext;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
 import java.io.Serializable;
 
 /**
@@ -17,6 +18,9 @@ import java.io.Serializable;
 @ExcelContext(fileName = "商品列表信息", sheetName = "商品列表信息")
 public class GoodsListExport implements Serializable {
 
+    @Serial
+    private static final long serialVersionUID = 6833195135537265912L;
+
     @ExcelProperty(value = "上架状态", index = 0)
     private String statusLabel;
 

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/KwpGoods.java

@@ -8,6 +8,8 @@ import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -21,8 +23,10 @@ import java.util.Date;
 @ToString
 @Accessors(chain = true)
 @TableName("kwp_goods")
-public class KwpGoods extends BaseModel {
+public class KwpGoods extends BaseModel implements Serializable {
 
+    @Serial
+    private static final long serialVersionUID = -4571752839456202179L;
     /**
      * 企业id
      */

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/KwpGoodsAddress.java

@@ -7,6 +7,9 @@ import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
+
 /**
  * @desc: 商品地址信息
  * @author: yzc
@@ -17,8 +20,10 @@ import lombok.experimental.Accessors;
 @ToString
 @Accessors(chain = true)
 @TableName("kwp_goods_address")
-public class KwpGoodsAddress extends BaseModel {
+public class KwpGoodsAddress extends BaseModel implements Serializable {
 
+    @Serial
+    private static final long serialVersionUID = -3900287269028978124L;
     /**
      * 商品id
      */

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/KwpGoodsAttribute.java

@@ -7,6 +7,9 @@ import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
+
 /**
  * @desc: 商品-参数类目
  * @author: yzc
@@ -17,8 +20,10 @@ import lombok.experimental.Accessors;
 @ToString
 @Accessors(chain = true)
 @TableName("kwp_goods_attribute")
-public class KwpGoodsAttribute extends BaseModel {
+public class KwpGoodsAttribute extends BaseModel implements Serializable {
 
+    @Serial
+    private static final long serialVersionUID = 1003536970271997258L;
     /**
      * 商品id
      */

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/KwpGoodsImage.java

@@ -7,6 +7,9 @@ import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
+
 /**
  * @desc: 商品-图片
  * @author: yzc
@@ -17,8 +20,10 @@ import lombok.experimental.Accessors;
 @ToString
 @Accessors(chain = true)
 @TableName("kwp_goods_image")
-public class KwpGoodsImage extends BaseModel {
+public class KwpGoodsImage extends BaseModel implements Serializable {
 
+    @Serial
+    private static final long serialVersionUID = 3897772508943943613L;
     /**
      * 商品id
      */

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/KwpGoodsPriceRange.java

@@ -7,6 +7,8 @@ import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
 import java.math.BigDecimal;
 
 /**
@@ -19,8 +21,10 @@ import java.math.BigDecimal;
 @ToString
 @Accessors(chain = true)
 @TableName("kwp_goods_price_range")
-public class KwpGoodsPriceRange extends BaseModel {
+public class KwpGoodsPriceRange extends BaseModel implements Serializable {
 
+    @Serial
+    private static final long serialVersionUID = 234896343045075865L;
     /**
      * 商品id
      */

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/KwpGoodsSku.java

@@ -7,6 +7,9 @@ import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
+
 /**
  * @desc: 商品-规格（sku）
  * @author: yzc
@@ -17,8 +20,10 @@ import lombok.experimental.Accessors;
 @ToString
 @Accessors(chain = true)
 @TableName("kwp_goods_sku")
-public class KwpGoodsSku extends BaseModel {
+public class KwpGoodsSku extends BaseModel implements Serializable {
 
+    @Serial
+    private static final long serialVersionUID = -6249704905372870133L;
     /**
      * 商品code
      */

sckw-modules/sckw-product/src/main/java/com/sckw/product/service/KwpGoodsService.java

@@ -533,9 +533,10 @@ public class KwpGoodsService {
         List<GoodsListExport> list = new ArrayList<>();
         goodsLists.forEach(e -> {
             GoodsListExport export = BeanUtils.copyProperties(e, GoodsListExport.class);
-            export.setHighestPrice(String.valueOf(e.getHighestPrice())).setLowestPrice(String.valueOf(e.getLowestPrice()))
+            export.setHighestPrice(Objects.isNull(e.getHighestPrice()) ? null :String.valueOf(e.getHighestPrice()))
+                    .setLowestPrice(Objects.isNull(e.getLowestPrice()) ? null :String.valueOf(e.getLowestPrice()))
                     .setAddedTime(Objects.isNull(e.getAddedTime()) ? null : DateUtil.getDateTime(e.getAddedTime()))
-                    .setAddedTime(Objects.isNull(e.getShelfTime()) ? null : DateUtil.getDateTime(e.getShelfTime()));
+                    .setShelfTime(Objects.isNull(e.getShelfTime()) ? null : DateUtil.getDateTime(e.getShelfTime()));
             list.add(export);
         });
         return list;

sckw-modules/sckw-report/src/main/java/com/sckw/report/controller/KwOrderController.java

@@ -1,8 +1,8 @@
 package com.sckw.report.controller;
 
+import com.sckw.core.exception.BusinessException;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.web.response.HttpResult;
-import com.sckw.excel.easyexcel.RequestHolder;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.report.service.KwOrderService;
 import com.sckw.report.service.param.*;
@@ -70,14 +70,12 @@ public class KwOrderController {
      * @return: com.sckw.core.web.response.HttpResult
      */
     @PostMapping(value = "/tradeOrderExport", produces = MediaType.APPLICATION_JSON_VALUE)
-    public HttpResult export(@RequestBody @Validated TradeOrderListExportParam params) {
-        HttpServletResponse response = RequestHolder.getResponse();
+    public void export(@RequestBody @Validated TradeOrderListExportParam params, HttpServletResponse response) {
         List<TradeOrderListExport> list = orderService.export(params);
-        if (CollectionUtils.isNotEmpty(list)) {
-            ExcelUtil.download(response, TradeOrderListExport.class, list);
-            return HttpResult.ok();
+        if (CollectionUtils.isEmpty(list)) {
+            throw new BusinessException("导出数据为空！");
         }
-        return HttpResult.error("没有可导出的数据");
+        ExcelUtil.downData(response, TradeOrderListExport.class, list);
     }
 
     /**

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/KwOrderService.java

@@ -251,6 +251,7 @@ public class KwOrderService {
                     .setSource(DictEnum.getLabel(DictTypeEnum.TORDER_SOURCE.getType(), e.getSource()))
                     .setUnitPrice(String.valueOf(e.getUnitPrice())).setPrice(String.valueOf(e.getPrice()))
                     .setAmount(String.valueOf(e.getAmount())).setActualAmount(String.valueOf(e.getActualAmount()))
+                    .setActualAmount(Objects.isNull(e.getActualAmount()) ? "0.00" : String.valueOf(e.getActualAmount()))
                     .setStartTime(Objects.isNull(e.getStartTime()) ? null : DateUtil.dateToStr(e.getStartTime()))
                     .setAddedTime(Objects.isNull(e.getEndTime()) ? null : DateUtil.dateToStr(e.getEndTime()))
                     .setCreateTime(DateUtil.getDateTime(e.getCreateTime()));

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/param/TradeOrderListExport.java

@@ -5,6 +5,9 @@ import com.sckw.excel.annotation.ExcelContext;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
+import java.io.Serializable;
+
 /**
  * @desc: 交易列表信息导出对象
  * @author: yzc
@@ -13,83 +16,86 @@ import lombok.experimental.Accessors;
 @Data
 @Accessors(chain = true)
 @ExcelContext(fileName = "交易列表信息", sheetName = "交易列表信息")
-public class TradeOrderListExport {
-    @ExcelProperty(value = "上架状态", index = 0)
+public class TradeOrderListExport implements Serializable {
+    @Serial
+    private static final long serialVersionUID = -5895230502149598364L;
+
+    @ExcelProperty(value = "上架状态" )
     private String status;
 
-    @ExcelProperty(value = "订单编号", index = 1)
+    @ExcelProperty(value = "订单编号" )
     private String tOrderNo;
 
-    @ExcelProperty(value = "采购单位", index = 2)
+    @ExcelProperty(value = "采购单位")
     private String procureFirmName;
 
-    @ExcelProperty(value = "销售单位", index = 3)
+    @ExcelProperty(value = "销售单位")
     private String supplyFirmName;
 
-    @ExcelProperty(value = "交付类型", index = 4)
+    @ExcelProperty(value = "交付类型" )
     private String deliveryType;
 
-    @ExcelProperty(value = "提货方式", index = 5)
+    @ExcelProperty(value = "提货方式" )
     private String pickupType;
 
-    @ExcelProperty(value = "托运状态", index = 6)
+    @ExcelProperty(value = "托运状态")
     private String consignmentStatus;
 
-    @ExcelProperty(value = "下单方式", index = 7)
+    @ExcelProperty(value = "下单方式" )
     private String source;
 
-    @ExcelProperty(value = "付款类型", index = 8)
+    @ExcelProperty(value = "付款类型")
     private String trading;
 
-    @ExcelProperty(value = "关联合同", index = 9)
+    @ExcelProperty(value = "关联合同")
     private String contractNo;
 
-    @ExcelProperty(value = "承包方式", index = 10)
+    @ExcelProperty(value = "承包方式")
     private String contractSigningWay;
 
-    @ExcelProperty(value = "商品名称", index = 11)
-    private String manageName;
+    @ExcelProperty(value = "商品名称")
+    private String goodsName;
 
-    @ExcelProperty(value = "规格", index = 12)
+    @ExcelProperty(value = "规格")
     private String goodsSpec;
 
-    @ExcelProperty(value = "上架时间", index = 13)
+    @ExcelProperty(value = "上架时间")
     private String addedTime;
 
-    @ExcelProperty(value = "单价/元", index = 14)
+    @ExcelProperty(value = "单价/元")
     private String unitPrice;
 
-    @ExcelProperty(value = "订单金额", index = 15)
+    @ExcelProperty(value = "订单金额")
     private String price;
 
-    @ExcelProperty(value = "订单目标", index = 16)
+    @ExcelProperty(value = "订单目标")
     private String amount;
 
-    @ExcelProperty(value = "已履约量", index = 17)
+    @ExcelProperty(value = "已履约量")
     private String actualAmount;
 
-    @ExcelProperty(value = "归属项目", index = 14)
+    @ExcelProperty(value = "归属项目")
     private String projectName;
 
-    @ExcelProperty(value = "装货地点", index = 15)
+    @ExcelProperty(value = "装货地点")
     private String loadCityName;
 
-    @ExcelProperty(value = "卸货地点", index = 16)
+    @ExcelProperty(value = "卸货地点")
     private String unloadCityName;
 
-    @ExcelProperty(value = "计划开始时间", index = 17)
+    @ExcelProperty(value = "计划开始时间")
     private String startTime;
 
-    @ExcelProperty(value = "计划结束时间", index = 17)
+    @ExcelProperty(value = "计划结束时间")
     private String endTime;
 
-    @ExcelProperty(value = "备注", index = 14)
+    @ExcelProperty(value = "备注")
     private String remark;
 
-    @ExcelProperty(value = "创造人", index = 15)
-    private String creatByName;
+    @ExcelProperty(value = "创造人")
+    private String createByName;
 
-    @ExcelProperty(value = "创建时间", index = 16)
+    @ExcelProperty(value = "创建时间")
     private String createTime;
 
 }