From 604bf600b33413dbf7c1cfb81ddf7762049fce20 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期五, 14 一月 2022 10:24:37 +0800
Subject: [PATCH] 解决layui框架bug

---
 src/main/java/zy/cloud/wms/manager/entity/Item.java |   32 +++++++++++++++++++++++++++++++-
 1 files changed, 31 insertions(+), 1 deletions(-)

diff --git a/src/main/java/zy/cloud/wms/manager/entity/Item.java b/src/main/java/zy/cloud/wms/manager/entity/Item.java
index 06374f4..d0c4426 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Item.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Item.java
@@ -11,6 +11,7 @@
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 import zy.cloud.wms.manager.service.CstmrService;
+import zy.cloud.wms.manager.service.ProjectStatusService;
 import zy.cloud.wms.manager.service.ProjectTypeService;
 import zy.cloud.wms.system.entity.Host;
 import zy.cloud.wms.system.entity.User;
@@ -20,6 +21,7 @@
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 
 @Data
 @TableName("man_item")
@@ -169,6 +171,9 @@
     @TableField("origin_area")
     private String originArea;
 
+    @TableField("project_status")
+    private Integer projectStatus;
+
     public Item() {}
 
 
@@ -191,6 +196,14 @@
 //            null    // 澶囨敞
 //    );
 
+    public String getProjectStatus$(){
+        ProjectStatusService bean = SpringUtils.getBean(ProjectStatusService.class);
+        ProjectStatus id = bean.selectOne(new EntityWrapper<ProjectStatus>().eq("id", this.projectStatus));
+        if (!Cools.isEmpty(this.id)) {
+            return id.getStatusName();
+        }
+        return null;
+    }
     public Long getId() {
         return id;
     }
@@ -312,8 +325,10 @@
         switch (this.status){
             case 1:
                 return "姝e父";
-            case 0:
+            case 3:
                 return "瀹岀粨";
+            case 2:
+                return "绂佺敤";
             default:
                 return String.valueOf(this.status);
         }
@@ -377,6 +392,21 @@
         return null;
     }
 
+    public String getRealStartTime$(){
+        if (!Cools.isEmpty(this.realStartTime)) {
+            return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.realStartTime);
+        }else {
+            return "";
+        }
+
+    }
+    public String getRealEndTime$(){
+        if (!Cools.isEmpty(this.realEndTime)) {
+            return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.realEndTime);
+        }else {
+            return "";
+        }
+    }
     public String getType$(){
         ProjectTypeService bean = SpringUtils.getBean(ProjectTypeService.class);
         ProjectType id = bean.selectOne(new EntityWrapper<ProjectType>()

--
Gitblit v1.9.1