From 72c120049ba6db6eded053e3ba106c2e13696e82 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期五, 21 一月 2022 12:38:54 +0800
Subject: [PATCH] 更新前端

---
 src/main/java/zy/cloud/wms/manager/entity/Item.java |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 51 insertions(+), 4 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 2cab0b2..6dd0f21 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Item.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Item.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.FieldStrategy;
 import com.baomidou.mybatisplus.enums.IdType;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
@@ -92,7 +93,7 @@
      * 寮�濮嬫椂闂�
      */
     @ApiModelProperty(value= "寮�濮嬫椂闂�")
-    @TableField("start_time")
+    @TableField(value = "start_time", strategy = FieldStrategy.IGNORED)
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date startTime;
 
@@ -100,7 +101,7 @@
      * 缁撴潫鏃堕棿
      */
     @ApiModelProperty(value= "缁撴潫鏃堕棿")
-    @TableField("end_time")
+    @TableField(value = "end_time" ,strategy = FieldStrategy.IGNORED)
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date endTime;
 
@@ -150,12 +151,12 @@
     private String type;
 
 
-    @TableField("real_start_time")
+    @TableField(value = "real_start_time", strategy = FieldStrategy.IGNORED)
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date realStartTime;
 
 
-    @TableField("real_end_time")
+    @TableField(value = "real_end_time", strategy = FieldStrategy.IGNORED)
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date realEndTime;
 
@@ -297,6 +298,13 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.startTime);
     }
 
+    public String getStartTime0$(){
+        if (Cools.isEmpty(this.startTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd").format(this.startTime);
+    }
+
     public void setStartTime(Date startTime) {
         this.startTime = startTime;
     }
@@ -310,6 +318,12 @@
             return "";
         }
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.endTime);
+    }
+    public String getEndTime0$(){
+        if (Cools.isEmpty(this.endTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd").format(this.endTime);
     }
 
     public void setEndTime(Date endTime) {
@@ -392,6 +406,39 @@
         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 getRealStartTime0$(){
+        if (!Cools.isEmpty(this.realStartTime)) {
+            return new SimpleDateFormat("yyyy-MM-dd").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 getRealEndTime0$(){
+        if (!Cools.isEmpty(this.realEndTime)) {
+            return new SimpleDateFormat("yyyy-MM-dd").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