From 6a5319a98427a4d1864e5e7c20a66436f5e5db0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com>
Date: Thu, 11 Sep 2025 14:07:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E7=BB=84=E7=BB=B4=E4=BF=AE?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E3=80=81=E4=B8=93=E5=AE=B6=E7=BB=84=E7=BB=B4?=
 =?UTF-8?q?=E4=BF=AE=E5=B7=A5=E5=8D=95=E5=A2=9E=E5=8A=A0=20=E5=AE=9E?=
 =?UTF-8?q?=E9=99=85=E6=89=A7=E8=A1=8C=E6=97=B6=E9=97=B4=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/pms/data/EamWorkOrderInData.java  | 37 +++++++++++++++----
 src/main/resources/mapper/pms/EamMapper.xml   |  6 +++
 2 files changed, 35 insertions(+), 8 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 a0ee91eb..3a5c4804 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
@@ -22,6 +22,13 @@ public class EamWorkOrderInData extends  EamWorkOrderData{
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date endDate2;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date actualStartDate;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date actualEndDate;
+
     private String userId;
     private String planOperatorName;
     private String actualOperatorName;
@@ -38,14 +45,6 @@ public class EamWorkOrderInData extends  EamWorkOrderData{
         this.difficultyRemark = difficultyRemark;
     }
 
-    public String getIsReturn() {
-        return isReturn;
-    }
-
-    public void setIsReturn(String isReturn) {
-        this.isReturn = isReturn;
-    }
-
     // 审核员名称
     private String checkerName;
     private String codeDesc;
@@ -124,6 +123,28 @@ public class EamWorkOrderInData extends  EamWorkOrderData{
 
 
     private List<EamWorkOrderInData> informationList;
+    public Date getActualStartDate() {
+        return actualStartDate;
+    }
+
+    public void setActualStartDate(Date actualStartDate) {
+        this.actualStartDate = actualStartDate;
+    }
+
+    public Date getActualEndDate() {
+        return actualEndDate;
+    }
+
+    public void setActualEndDate(Date actualEndDate) {
+        this.actualEndDate = actualEndDate;
+    }
+    public String getIsReturn() {
+        return isReturn;
+    }
+
+    public void setIsReturn(String isReturn) {
+        this.isReturn = isReturn;
+    }
 
     public List<EamWorkOrderInData> getInformationList() {
         return informationList;
diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml
index 085293ee..fba45a0c 100644
--- a/src/main/resources/mapper/pms/EamMapper.xml
+++ b/src/main/resources/mapper/pms/EamMapper.xml
@@ -1102,6 +1102,12 @@
                 <if test="query.endDate != null ">
                     AND #{query.endDate} >= a.PlanDate
                 </if>
+                <if test="query.actualStartDate != null ">
+                    AND a.ActualDate >= #{query.actualStartDate}
+                </if>
+                <if test="query.actualEndDate != null ">
+                    AND DATEADD(DAY, 1, CONVERT(DATE, #{query.actualEndDate})) > a.ActualDate
+                </if>
                 <if test="query.urgency != null and query.urgency != ''">
                     AND b.urgency = #{query.urgency}
                 </if>