From 0d740d97c228127731e35222635a064c42591a8a Mon Sep 17 00:00:00 2001
From: DouDou <877258667@qq.com>
Date: Sun, 20 Oct 2024 16:21:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=9A=84Debug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D20241020?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/Tooling/data/IfsToolData.java     | 34 +++++++++++++++++++
 .../Tooling/data/IfsToolInstanceData.java     | 16 +++++++++
 .../modules/Tooling/entity/IfsTool.java       | 10 ++++++
 .../Tooling/entity/IfsToolInstance.java       | 10 +++---
 4 files changed, 65 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/spring/modules/Tooling/data/IfsToolData.java b/src/main/java/com/spring/modules/Tooling/data/IfsToolData.java
index f1705228..f25f49f7 100644
--- a/src/main/java/com/spring/modules/Tooling/data/IfsToolData.java
+++ b/src/main/java/com/spring/modules/Tooling/data/IfsToolData.java
@@ -1,5 +1,8 @@
 package com.spring.modules.Tooling.data;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.util.Date;
 
 public class IfsToolData extends PageData {
@@ -19,7 +22,14 @@ public class IfsToolData extends PageData {
     private String noteText;// 备注
     private String ifsRowId;
     private String ifsRowVersion;
+    private String createdBy;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createDate;
+    private String updatedBy;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updatedDate;
     private String username;
     private String state;
     private String toolTypeDesc;
@@ -205,4 +215,28 @@ public class IfsToolData extends PageData {
     public void setPropertyNo(String propertyNo) {
         this.propertyNo = propertyNo;
     }
+
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    public String getUpdatedBy() {
+        return updatedBy;
+    }
+
+    public void setUpdatedBy(String updatedBy) {
+        this.updatedBy = updatedBy;
+    }
+
+    public Date getUpdatedDate() {
+        return updatedDate;
+    }
+
+    public void setUpdatedDate(Date updatedDate) {
+        this.updatedDate = updatedDate;
+    }
 }
diff --git a/src/main/java/com/spring/modules/Tooling/data/IfsToolInstanceData.java b/src/main/java/com/spring/modules/Tooling/data/IfsToolInstanceData.java
index a5019eaa..f70eaac4 100644
--- a/src/main/java/com/spring/modules/Tooling/data/IfsToolInstanceData.java
+++ b/src/main/java/com/spring/modules/Tooling/data/IfsToolInstanceData.java
@@ -1,5 +1,10 @@
 package com.spring.modules.Tooling.data;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
 public class IfsToolInstanceData extends IfsToolData {
     private String toolInstance;
     private String description;
@@ -23,6 +28,9 @@ public class IfsToolInstanceData extends IfsToolData {
     private String normalWorkCenterDesc;
     private String state;
     private String normalProductionLineDesc;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createdDate;
 
     public IfsToolInstanceData() {
         super();
@@ -199,4 +207,12 @@ public class IfsToolInstanceData extends IfsToolData {
     public void setNormalProductionLineDesc(String normalProductionLineDesc) {
         this.normalProductionLineDesc = normalProductionLineDesc;
     }
+
+    public Date getCreatedDate() {
+        return createdDate;
+    }
+
+    public void setCreatedDate(Date createdDate) {
+        this.createdDate = createdDate;
+    }
 }
diff --git a/src/main/java/com/spring/modules/Tooling/entity/IfsTool.java b/src/main/java/com/spring/modules/Tooling/entity/IfsTool.java
index 20975ccb..0f2cfab0 100644
--- a/src/main/java/com/spring/modules/Tooling/entity/IfsTool.java
+++ b/src/main/java/com/spring/modules/Tooling/entity/IfsTool.java
@@ -24,6 +24,7 @@ public class IfsTool extends PageData {
     private String username;
     private String state;
     private String propertyNo;
+    private Date updatedDate;
 
     public IfsTool() {
     }
@@ -179,4 +180,13 @@ public class IfsTool extends PageData {
     public void setPropertyNo(String propertyNo) {
         this.propertyNo = propertyNo;
     }
+
+
+    public Date getUpdatedDate() {
+        return updatedDate;
+    }
+
+    public void setUpdatedDate(Date updatedDate) {
+        this.updatedDate = updatedDate;
+    }
 }
diff --git a/src/main/java/com/spring/modules/Tooling/entity/IfsToolInstance.java b/src/main/java/com/spring/modules/Tooling/entity/IfsToolInstance.java
index 8ca21c6d..dbf1fad2 100644
--- a/src/main/java/com/spring/modules/Tooling/entity/IfsToolInstance.java
+++ b/src/main/java/com/spring/modules/Tooling/entity/IfsToolInstance.java
@@ -25,7 +25,7 @@ public class IfsToolInstance extends IfsTool {
     private String toolBias;
     private String toolStability;
     private String toolReproducibility;
-    private Date createDate;
+    private Date createdDate;
 
     public IfsToolInstance() {
         super();
@@ -144,11 +144,11 @@ public class IfsToolInstance extends IfsTool {
         this.toolReproducibility = toolReproducibility;
     }
 
-    public Date getCreateDate() {
-        return createDate;
+    public Date getCreatedDate() {
+        return createdDate;
     }
 
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
+    public void setCreatedDate(Date createdDate) {
+        this.createdDate = createdDate;
     }
 }