From 0dd23ce00979f8aa836b19e3c565094665d6fa47 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期一, 17 一月 2022 14:33:02 +0800
Subject: [PATCH] 新增点击排序功能

---
 src/main/java/zy/cloud/wms/manager/entity/Item.java |   72 +++++++++++++++++++++++++++++++++--
 1 files changed, 67 insertions(+), 5 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..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;
@@ -11,6 +12,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 +22,7 @@
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 
 @Data
 @TableName("man_item")
@@ -90,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;
 
@@ -98,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;
 
@@ -148,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;
 
@@ -168,6 +171,9 @@
 
     @TableField("origin_area")
     private String originArea;
+
+    @TableField("project_status")
+    private Integer projectStatus;
 
     public Item() {}
 
@@ -191,6 +197,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;
     }
@@ -284,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;
     }
@@ -297,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) {
@@ -312,8 +339,10 @@
         switch (this.status){
             case 1:
                 return "姝ｅ父";
-            case 0:
+            case 3:
                 return "瀹岀粨";
+            case 2:
+                return "绂佺敤";
             default:
                 return String.valueOf(this.status);
         }
@@ -377,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