From d31dad0bcf188ab93ee4bee503a6b453c6b50cac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com>
Date: Mon, 20 Oct 2025 15:32:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=82=B9=E6=A3=80=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E6=97=B6=EF=BC=8C=E7=82=B9=E6=A3=80=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=8F=AF=E9=80=89=E5=80=BC=20=E6=B2=A1=E6=9C=89=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/pms/data/EamWorkOrderInData.java  | 37 +++++++++++++------
 .../pms/service/Impl/EamServiceImpl.java      |  1 +
 src/main/resources/mapper/pms/EamMapper.xml   |  4 +-
 3 files changed, 30 insertions(+), 12 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 3a5c4804..2dab7ac1 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
@@ -34,17 +34,8 @@ public class EamWorkOrderInData extends  EamWorkOrderData{
     private String actualOperatorName;
     private String isReturn;
     private String difficultyRemark;
-
-    @Override
-    public String getDifficultyRemark() {
-        return difficultyRemark;
-    }
-
-    @Override
-    public void setDifficultyRemark(String difficultyRemark) {
-        this.difficultyRemark = difficultyRemark;
-    }
-
+    private String planPeriod;
+    private String planCycle;
     // 审核员名称
     private String checkerName;
     private String codeDesc;
@@ -123,6 +114,30 @@ public class EamWorkOrderInData extends  EamWorkOrderData{
 
 
     private List<EamWorkOrderInData> informationList;
+    public String getPlanPeriod() {
+        return planPeriod;
+    }
+
+    public void setPlanPeriod(String planPeriod) {
+        this.planPeriod = planPeriod;
+    }
+
+    public String getPlanCycle() {
+        return planCycle;
+    }
+
+    public void setPlanCycle(String planCycle) {
+        this.planCycle = planCycle;
+    }
+    @Override
+    public String getDifficultyRemark() {
+        return difficultyRemark;
+    }
+
+    @Override
+    public void setDifficultyRemark(String difficultyRemark) {
+        this.difficultyRemark = difficultyRemark;
+    }
     public Date getActualStartDate() {
         return actualStartDate;
     }
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 2b6c4206..d6e2f8f2 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
@@ -1789,6 +1789,7 @@ public class EamServiceImpl implements EamService {
                     searchData.setPlanID(inData.getPlanID());
                     searchData.setItemType(inData.getItemType());
                     searchData.setObjectID(inData.getObjectID());
+                    searchData.setBuNo(inData.getBuNo());
                     List<EamWorkPlanItemAvailableData> availableDataList = eamMapper.searchPlanItemAvailable(searchData);
                     result.get(i).setAvailableList(availableDataList);
                 }
diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml
index 3437497f..776d3806 100644
--- a/src/main/resources/mapper/pms/EamMapper.xml
+++ b/src/main/resources/mapper/pms/EamMapper.xml
@@ -766,7 +766,9 @@
             ELSE DATEDIFF(MINUTE, a.CreateDate, a.reach_date)
             END AS responseTime,
             a.check_type,
-            a.is_return
+            a.is_return,
+            ewo.plan_period,
+            ewo.plan_cycle
         FROM eam_workOrder a
         left join eam_object as eo on eo.site  = a.site and eo.ObjectID = a.ObjectID and eo.bu_no = a.bu_no
         left join sys_department as sd ON eo.site = sd.site and eo.dept_id = sd.department_id and eo.bu_no = sd.bu_no