From 5b53ccc3d0e46773c3fa58751935df331d562af4 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期三, 12 一月 2022 21:25:24 +0800
Subject: [PATCH] 改完项目管理和项目节点管理功能

---
 src/main/java/zy/cloud/wms/manager/entity/Item.java |   78 +++++++++++++++++++++++++++++---------
 1 files changed, 59 insertions(+), 19 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 ffc584b..06374f4 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Item.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Item.java
@@ -4,9 +4,14 @@
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+import zy.cloud.wms.manager.service.CstmrService;
+import zy.cloud.wms.manager.service.ProjectTypeService;
 import zy.cloud.wms.system.entity.Host;
 import zy.cloud.wms.system.entity.User;
 import zy.cloud.wms.system.service.HostService;
@@ -16,6 +21,7 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+@Data
 @TableName("man_item")
 public class Item implements Serializable {
 
@@ -85,6 +91,7 @@
      */
     @ApiModelProperty(value= "寮�濮嬫椂闂�")
     @TableField("start_time")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date startTime;
 
     /**
@@ -92,12 +99,13 @@
      */
     @ApiModelProperty(value= "缁撴潫鏃堕棿")
     @TableField("end_time")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date endTime;
 
     /**
      * 鐘舵�� 1: 姝ｅ父  0: 绂佺敤
      */
-    @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父  0: 绂佺敤  ")
+    @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父  0: 瀹岀粨  ")
     private Integer status;
 
     /**
@@ -112,6 +120,7 @@
      */
     @ApiModelProperty(value= "娣诲姞鏃堕棿")
     @TableField("create_time")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /**
@@ -126,6 +135,7 @@
      */
     @ApiModelProperty(value= "淇敼鏃堕棿")
     @TableField("update_time")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
     /**
@@ -134,25 +144,34 @@
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
+    @TableField("type")
+    private String type;
+
+
+    @TableField("real_start_time")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date realStartTime;
+
+
+    @TableField("real_end_time")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date realEndTime;
+
+    @TableField("real_month")
+    private Integer realMonth;
+
+    @TableField("duty_department")
+    private String dutyDepartment;
+
+    @TableField("duty_man")
+    private String dutyMan;
+
+    @TableField("origin_area")
+    private String originArea;
+
     public Item() {}
 
-    public Item(Long hostId, String uuid,String name,String inUuid,String cstmrUuid,String cstmr,String member,String leader,Date startTime,Date endTime,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
-        this.hostId = hostId;
-        this.name = name;
-        this.inUuid = inUuid;
-        this.cstmrUuid = cstmrUuid;
-        this.cstmr = cstmr;
-        this.member = member;
-        this.leader = leader;
-        this.startTime = startTime;
-        this.endTime = endTime;
-        this.status = status;
-        this.createBy = createBy;
-        this.createTime = createTime;
-        this.updateBy = updateBy;
-        this.updateTime = updateTime;
-        this.memo = memo;
-    }
+
 
 //    Item item = new Item(
 //            null,    // 椤圭洰缂栧彿[闈炵┖]
@@ -200,6 +219,7 @@
     public String getUuid() {
         return uuid;
     }
+
 
     public void setUuid(String uuid) {
         this.uuid = uuid;
@@ -293,7 +313,7 @@
             case 1:
                 return "姝ｅ父";
             case 0:
-                return "绂佺敤";
+                return "瀹岀粨";
             default:
                 return String.valueOf(this.status);
         }
@@ -347,6 +367,25 @@
         }
         return null;
     }
+    public String getCstmrUuid$(){
+        CstmrService bean = SpringUtils.getBean(CstmrService.class);
+        Cstmr id = bean.selectOne(new EntityWrapper<Cstmr>()
+                .eq("id", this.cstmrUuid));
+        if (!Cools.isEmpty(id)) {
+            return id.getName();
+        }
+        return null;
+    }
+
+    public String getType$(){
+        ProjectTypeService bean = SpringUtils.getBean(ProjectTypeService.class);
+        ProjectType id = bean.selectOne(new EntityWrapper<ProjectType>()
+                .eq("id", this.type));
+        if (!Cools.isEmpty(id)) {
+            return id.getTypeName();
+        }
+        return null;
+    }
 
     public void setUpdateBy(Long updateBy) {
         this.updateBy = updateBy;
@@ -376,4 +415,5 @@
     }
 
 
+
 }

--
Gitblit v1.9.1