提交基础采购

klp-erp/src/main/java/com/klp/erp/domain/vo/ErpPurchaseOrderVo.java

@@ -1,14 +1,13 @@
 package com.klp.erp.domain.vo;
 
-import java.math.BigDecimal;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.klp.common.annotation.ExcelDictFormat;
-import com.klp.common.convert.ExcelDictConvert;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 采购订单主视图对象 erp_purchase_order
@@ -18,7 +17,7 @@ import lombok.Data;
  */
 @Data
 @ExcelIgnoreUnannotated
-public class ErpPurchaseOrderVo {
+public class ErpPurchaseOrderVo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -44,12 +43,14 @@ public class ErpPurchaseOrderVo {
      * 下单日期
      */
     @ExcelProperty(value = "下单日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date orderDate;
 
     /**
      * 预计到货日期
      */
     @ExcelProperty(value = "预计到货日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date expectedArrival;
 
     /**
@@ -68,7 +69,20 @@ public class ErpPurchaseOrderVo {
      * 订单状态
      */
     @ExcelProperty(value = "订单状态")
-    private Long orderStatus;
+    private Integer orderStatus;
+
+    /**
+     * 下达人
+     */
+    @ExcelProperty(value = "下达人")
+    private String confirmBy;
+
+    /**
+     * 下达时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ExcelProperty(value = "下达时间")
+    private Date confirmTime;
 
     /**
      * 备注