2024-02-04 设备正式提交3

src/main/java/com/jianteng/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;
     }

src/main/java/com/jianteng/modules/pms/service/impl/EamServiceImpl.java

@@ -1654,8 +1654,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())) {
             // 获取当前时间为实际执行时间