From dc8367b8e744f9f02b606597a2c3a3b0783afc19 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 13 四月 2024 14:44:47 +0800
Subject: [PATCH] 地图数据json文件改为常量存储

---
 src/main/java/com/zy/asrs/entity/Pla.java |   43 ++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/Pla.java b/src/main/java/com/zy/asrs/entity/Pla.java
index 209dd5e..3f3c68c 100644
--- a/src/main/java/com/zy/asrs/entity/Pla.java
+++ b/src/main/java/com/zy/asrs/entity/Pla.java
@@ -67,7 +67,7 @@
     //鍖呰鍙�
     @TableField("package_no")
     @ExcelProperty(value = "鍖呰鍙�")
-    private String packageNo;
+    private Integer packageNo;
 
     //鍖呰鍙�
     @ExcelProperty(value = "鐢熶骇鏃ユ湡")
@@ -214,7 +214,7 @@
 
     //搴撲綅
     @TableField("loc_no")
-    //@ExcelProperty(value = "搴撲綅")
+    @ExcelProperty(value = "搴撲綅")
     private String locNo;
 
     //鐘舵��
@@ -223,7 +223,7 @@
 
     //姝ラ
     @TableField("step")
-    private int step;
+    private Integer step;
 
     @TableField("create_time")
     private Date createTime;
@@ -261,10 +261,47 @@
     @TableField("memo")
     private String memo;
 
+    @TableField("stock_freeze")
+    private Integer stockFreeze;
+
+    @TableField("stock_freeze_by")
+    private String stockFreezeBy;
+
+    @TableField("stock_freeze_date")
+    private Date stockFreezeDate;
+
+    public String getCreateTime$() {
+        if (Cools.isEmpty(this.createTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd").format(this.createTime);
+    }
+
+    public String getPackageNo$(){
+        if(Cools.isEmpty(packageNo)){
+            return null;
+        }
+        if(packageNo < 10){
+            return "00" + packageNo;
+        }else if(packageNo < 100){
+            return "0" + packageNo;
+        }else {
+            return packageNo + "";
+        }
+
+    }
+
     public String getPakinTime$() {
         if (Cools.isEmpty(this.pakinTime)){
             return "";
         }
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.pakinTime);
     }
+
+    public String getStockFreezeDate$() {
+        if (Cools.isEmpty(this.stockFreezeDate)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.stockFreezeDate);
+    }
 }

--
Gitblit v1.9.1