备品备件出入库优化2

op-modules/op-device/src/main/java/com/op/device/domain/EquSparepartsInOut.java

@@ -21,7 +21,7 @@ public class EquSparepartsInOut extends BaseEntity {
 
     private String id;
 
-    @Excel(name = "出入库类型")
+    @Excel(name = "出入库类型", readConverterExp = "type_out=出库,type_in=入库")
     private String inOutType;
 
     @Excel(name = "出入库单号")
@@ -42,22 +42,27 @@ public class EquSparepartsInOut extends BaseEntity {
     @Excel(name = "总价")
     private BigDecimal allPrice;
 
-    @Excel(name = "备用1")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "出入库时间",width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @Excel(name = "出入库人员")
+    private String nickName;
+   // @Excel(name = "备用1")
     private String attr1;
 
-    @Excel(name = "备用2")
+  //  @Excel(name = "备用2")
     private String attr2;
 
-    @Excel(name = "备用3")
+   // @Excel(name = "备用3")
     private String attr3;
 
-    @Excel(name = "删除标记")
+   // @Excel(name = "删除标记")
     private String delFlag;
 
-    @Excel(name = "工厂号")
+   // @Excel(name = "工厂号")
     private String factoryCode;
 
-    private String nickName;
 
     ///////////////////////////
     private String storageId;
@@ -82,6 +87,16 @@ public class EquSparepartsInOut extends BaseEntity {
         OutAmount = outAmount;
     }
 
+    @Override
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    @Override
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
     public String getNickName() {
         return nickName;
     }