From 4f10f9103555ba571b98afa63b711317beb1d58c Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Sun, 4 Feb 2024 09:56:57 +0800
Subject: [PATCH] =?UTF-8?q?2024-02-04=20=E7=B3=BB=E7=BB=9F=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/pms/data/EamWorkOrderInData.java  | 26 +++++++++++++++++--
 .../pms/service/Impl/EamServiceImpl.java      |  4 +--
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderInData.java b/src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderInData.java
index dc9d0438..90deadb3 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderInData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderInData.java
@@ -10,12 +10,18 @@ import java.util.List;
 
 public class EamWorkOrderInData extends  EamWorkOrderData{
     private String objectDesc;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date startDate;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date endDate;
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date startDate;
+    private Date startDate2;
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date endDate;
+    private Date endDate2;
     private String userId;
     private String planOperatorName;
     private String actualOperatorName;
@@ -63,6 +69,22 @@ public class EamWorkOrderInData extends  EamWorkOrderData{
 
     private String searchType;
 
+    public Date getStartDate2() {
+        return startDate2;
+    }
+
+    public void setStartDate2(Date startDate2) {
+        this.startDate2 = startDate2;
+    }
+
+    public Date getEndDate2() {
+        return endDate2;
+    }
+
+    public void setEndDate2(Date endDate2) {
+        this.endDate2 = endDate2;
+    }
+
     public String getSearchType() {
         return searchType;
     }
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
index 29e23b7c..1181750d 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
@@ -1658,8 +1658,8 @@ public class EamServiceImpl implements EamService {
         inData.setActualOperator(check.get(0).getAdminID());
 
         if ("A".equals(inData.getFunctionType())) {
-            inData.setReachDate(inData.getStartDate());
-            inData.setActualDate(inData.getEndDate());
+            inData.setReachDate(inData.getStartDate2());
+            inData.setActualDate(inData.getEndDate2());
         }
         if ("B".equals(inData.getFunctionType())) {
             // 获取当前时间为实际执行时间