From 012f80529db9aa5065f51bde3fd65ff1ffe9eb61 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期日, 07 四月 2024 08:23:10 +0800
Subject: [PATCH] bug修复

---
 src/main/java/com/zy/asrs/entity/Pla.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/Pla.java b/src/main/java/com/zy/asrs/entity/Pla.java
index a1b0d29..3f3c68c 100644
--- a/src/main/java/com/zy/asrs/entity/Pla.java
+++ b/src/main/java/com/zy/asrs/entity/Pla.java
@@ -278,6 +278,9 @@
     }
 
     public String getPackageNo$(){
+        if(Cools.isEmpty(packageNo)){
+            return null;
+        }
         if(packageNo < 10){
             return "00" + packageNo;
         }else if(packageNo < 100){
@@ -292,13 +295,13 @@
         if (Cools.isEmpty(this.pakinTime)){
             return "";
         }
-        return new SimpleDateFormat("yyyy-MM-dd HH").format(this.pakinTime);
+        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").format(this.stockFreezeDate);
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.stockFreezeDate);
     }
 }

--
Gitblit v1.9.1