From 5c39f26d19269ddcb8d442aeeecfee5a9665bb59 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 06 九月 2022 13:19:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zypms' into zypms
---
src/main/java/zy/cloud/wms/manager/entity/Item.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 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 ac5887c..46291cd 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,7 @@
private String type;
+
@TableField(value = "real_start_time", strategy = FieldStrategy.IGNORED)
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date realStartTime;
@@ -400,6 +401,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();
+// }
+//
+// return "";
+// }
+
public String getProjectStatus$(){
ProjectStatusService bean = SpringUtils.getBean(ProjectStatusService.class);
ProjectStatus id = bean.selectOne(new EntityWrapper<ProjectStatus>().eq("id", this.projectStatus));
--
Gitblit v1.9.1