From 320ed3f4782f9662f79ecfe14d2cf3f34dd288c5 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 01 八月 2023 19:52:36 +0800
Subject: [PATCH] #

---
 src/main/java/zy/cloud/wms/manager/entity/Item.java |   30 +++++++++++++++++++++---------
 1 files changed, 21 insertions(+), 9 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 a448111..304ce74 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Item.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Item.java
@@ -149,6 +149,8 @@
     private String type;
 
 
+
+
     @TableField(value = "real_start_time", strategy = FieldStrategy.IGNORED)
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date realStartTime;
@@ -400,16 +402,17 @@
 //            null    // 澶囨敞
 //    );
 
-    public String getProgressRate$(){
-        ProjectStatusService bean = SpringUtils.getBean(ProjectStatusService.class);
-        ProjectStatus id = bean.selectOne(new EntityWrapper<ProjectStatus>()
-                .eq("id", this.progressRate));
-        if (!Cools.isEmpty(id)) {
-            return id.getStatusName();
-        }
+//    public String getProgressRate$(){
+//        ProjectStatusService bean = SpringUtils.getBean(ProjectStatusService.class);
+//        ProjectStatus id = bean.selectOne(new EntityWrapper<ProjectStatus>()
+//                .eq("id", this.progressRate));
+//        if (!Cools.isEmpty(id)) {
+//            return id.getStatusName();
+//        }
+//
+//        return "";
+//    }
 
-        return "";
-    }
     public String getProjectStatus$(){
         ProjectStatusService bean = SpringUtils.getBean(ProjectStatusService.class);
         ProjectStatus id = bean.selectOne(new EntityWrapper<ProjectStatus>().eq("id", this.projectStatus));
@@ -688,6 +691,15 @@
         return null;
     }
 
+    public String getType$$(){
+        if (this.type.equals("10")) {
+            return "闆嗘垚椤圭洰";
+        }else {
+            return "甯歌椤圭洰";
+        }
+
+    }
+
     public void setUpdateBy(Long updateBy) {
         this.updateBy = updateBy;
     }

--
Gitblit v1.9.1